Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed Compiling on Linux, merged changes from fork

  • Loading branch information...
commit 1a53037f6b6ff5c65f43aafce2382ada2dc6a6a0 1 parent 283d1d4
@TheDushan authored
Showing with 1,451 additions and 4,029 deletions.
  1. +303 −214 CMakeLists.txt
  2. +118 −100 main/glsl/forwardLighting_fp.glsl
  3. +90 −78 src/engine/OpenWolf.sln
  4. +2 −2 src/engine/OpenWolf.vcxproj
  5. +4 −4 src/engine/OpenWolf.vcxproj.filters
  6. +0 −2  src/engine/botlib/l_struct.cpp
  7. +3 −2 src/engine/client/cl_cgame.cpp
  8. +2 −2 src/engine/client/cl_irc.cpp
  9. +1 −1  src/engine/client/cl_main.cpp
  10. +1 −1  src/engine/client/cl_parse.cpp
  11. +0 −2,127 src/engine/framework/Unzip.cpp
  12. +374 −363 src/engine/framework/Unzip.h
  13. +0 −233 src/engine/framework/ioapi.cpp
  14. +109 −117 src/engine/framework/ioapi.h
  15. +1 −2  src/engine/idLib/precompiled.h
  16. +11 −11 src/engine/qcommon/cm_load.cpp
  17. +0 −2  src/engine/qcommon/cm_local.h
  18. +1 −1  src/engine/qcommon/cm_patch.cpp
  19. +11 −2 src/engine/qcommon/cmd.cpp
  20. +1 −0  src/engine/qcommon/files.cpp
  21. +51 −0 src/engine/qcommon/q_shared.cpp
  22. +2 −0  src/engine/qcommon/q_shared.h
  23. +0 −425 src/engine/qcommon/vm.c
  24. +97 −79 src/engine/rendererGL/tr_bsp.cpp
  25. +2 −0  src/engine/rendererGL/tr_cmds.cpp
  26. +2 −0  src/engine/rendererGL/tr_curve.cpp
  27. +17 −5 src/engine/rendererGL/tr_local.h
  28. +49 −46 src/engine/rendererGL/tr_main.cpp
  29. +24 −17 src/engine/rendererGL/tr_model_md3.cpp
  30. +23 −16 src/engine/rendererGL/tr_model_mdc.cpp
  31. +1 −1  src/engine/rendererGL/tr_shade.cpp
  32. +6 −1 src/engine/rendererGL/tr_shader.cpp
  33. +0 −3  src/engine/rendererGL/tr_sky.cpp
  34. +5 −5 src/engine/rendererGL/tr_surface.cpp
  35. +68 −57 src/engine/rendererGL/tr_world.cpp
  36. +0 −34 src/engine/server/sv_ccmds.cpp
  37. +7 −7 src/engine/server/sv_game.cpp
  38. +1 −1  src/engine/server/sv_init.cpp
  39. +2 −1  src/engine/server/sv_main.cpp
  40. +2 −1  src/engine/snd_system/libmumblelink.cpp
  41. +50 −4 src/engine/snd_system/qal.cpp
  42. +0 −52 src/engine/snd_system/snd_mix.cpp
  43. +3 −2 src/engine/sys/con_curses.cpp
  44. +5 −6 src/engine/sys/sys_unix.cpp
  45. +1 −1  src/gamelogic/base/src/ui/ui_local.h
  46. +1 −1  src/gamelogic/base/src/ui/ui_shared.h
View
517 CMakeLists.txt
@@ -6,43 +6,53 @@
cmake_minimum_required( VERSION 2.8 )
-set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" )
-set( CMAKE_C_FLAGS "-msse2 -pipe" CACHE STRING "" )
-set( CMAKE_C_FLAGS_DEBUG "-g" CACHE STRING "" )
-set( CMAKE_C_FLAGS_MINSIZEREL "-DNDEBUG -Os" CACHE STRING "" )
-set( CMAKE_C_FLAGS_RELEASE "-DNDEBUG -O3 -ffast-math -fomit-frame-pointer -fno-strict-aliasing" CACHE STRING "" )
-set( CMAKE_C_FLAGS_RELWITHDEBINFO "-DNDEBUG -O3 -ffast-math -fomit-frame-pointer -fno-strict-aliasing -g" CACHE STRING "" )
-# Most of the source now builds without this flag, but there are a
-# few lines in SoundWorld.cpp which I'm unsure how to fix.
-set( CMAKE_CXX_FLAGS "-fpermissive" )
-set( CMAKE_CXX_FLAGS ${CMAKE_C_FLAGS} CACHE STRING "" )
-set( CMAKE_CXX_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG} CACHE STRING "" )
-set( CMAKE_CXX_FLAGS_MINSIZEREL ${CMAKE_C_FLAGS_MINSIZEREL} CACHE STRING "" )
-set( CMAKE_CXX_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE} CACHE STRING "" )
-set( CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS_RELWITHDEBINFO} CACHE STRING "" )
-set( CMAKE_BUILD_TYPE Release CACHE STRING "Build configuration (Debug, Release, RelWithDebInfo, MinSizeRel)" )
+if( POLICY CMP0017 )
+ cmake_policy( SET CMP0017 NEW )
+endif()
+include( CMakeDependentOption )
+
# This line has to appear before 'PROJECT' in order to be able to disable incremental linking
set( MSVC_INCREMENTAL_DEFAULT ON )
+set( CMAKE_BUILD_TYPE Release CACHE STRING "Build configuration (Debug, Release, RelWithDebInfo, MinSizeRel)" )
+
project( OpenWolf C CXX ASM )
+
+if( MSVC )
+ set( CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /arch:SSE /fp:precise /Oy" )
+else()
+ set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2 -pipe" )
+ set( CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g" )
+ set( CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -DNDEBUG -Os" )
+ set( CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNDEBUG -O3 -ffast-math -fomit-frame-pointer -fno-strict-aliasing" )
+ set( CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -DNDEBUG -O3 -ffast-math -fomit-frame-pointer -fno-strict-aliasing -g" )
+endif()
+
+set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_FLAGS}" )
+set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${CMAKE_C_FLAGS_DEBUG}" )
+set( CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} ${CMAKE_C_FLAGS_MINSIZEREL}" )
+set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${CMAKE_C_FLAGS_RELEASE}" )
+set( CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${CMAKE_C_FLAGS_RELWITHDEBINFO}" )
set( CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER} )
set( CMAKE_ASM_COMPILE_OBJECT ${CMAKE_C_COMPILE_OBJECT} )
set( CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "" ) # Need this to get rid of -rdynamic linker flag set by default by cmake
+set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" )
# Options
option( BUILD_CLIENT "Build OpenWolf client" ON )
-option( BUILD_OLD_RENDERER "Build old renderer library" ON )
+option( BUILD_OLD_RENDERER "Build old renderer library" OFF )
option( BUILD_NEW_RENDERER "Build new renderer library" ON )
option( BUILD_SERVER "Build OpenWolfded server" OFF )
option( BUILD_AUTOUPDATE_SERVER "Build OpenWolf AutoUpdate server" OFF )
-option( BUILD_GAME_SO_ET "Build game logic shared libraries for ET" ON )
+option( BUILD_GAME_SO_ET "Build game logic shared libraries for ET" OFF )
+option( BUILD_GAME_SO_BASE "Build game logic shared libraries for Tremulous 1.1.0" OFF )
option( BUILD_MASTER "Build master server" ON )
option( BUILD_OWMAP "Build Mapping tool" ON )
-option( USE_OPENAL "Use OpenAL" ON )
-if( USE_OPENAL )
- option( USE_OPENAL_DLOPEN "Use dlopen to load OpenAL" ON )
-endif( )
+option( USE_OPENAL "Use OpenAL" OFF )
+ if( USE_OPENAL )
+ option( USE_OPENAL_DLOPEN "Use dlopen to load OpenAL" OFF )
+ endif( )
option( USE_CPUINFO "Use CPUInfo (if compilation fails, then disable this)" ON )
option( USE_CURSES "Use the curses console" ON )
option( USE_CODEC_VORBIS "Compile with support for Vorbis" ON )
@@ -52,7 +62,7 @@ endif()
option( USE_GLSL_OPTIMIZER "Compile with GLSL Optimizer" OFF )
option( USE_MUMBLE "Compile with support for Mumble" ON )
option( USE_PHYSICS "Compile with Newton Physics" ON )
-option( USE_WEBP "Compile with WebP loader" ON )
+option( USE_WEBP "Compile with WebP loader" OFF )
option( USE_MYSQL "Compile with MYSQL support" ON )
option( USE_VOIP "Compile with VOIP support" ON )
if( USE_VOIP )
@@ -69,7 +79,8 @@ set( CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/GPL.txt" )
include( CPack )
set( MOUNT_DIR ${CMAKE_SOURCE_DIR}/src )
-set( GAME_DIR ${CMAKE_SOURCE_DIR}/src/gamelogic/etmain )
+set( GAME_DIR ${CMAKE_SOURCE_DIR}/src/gamelogic/etmain/src )
+set( BASE_DIR ${CMAKE_SOURCE_DIR}/src/gamelogic/base/src )
set( LIB_DIR ${CMAKE_SOURCE_DIR}/src/libs )
find_package( PkgConfig )
@@ -105,8 +116,8 @@ endif()
######################
set( SHAREDLIST
- ${MOUNT_DIR}/engine/qcommon/q_shared.c
- ${MOUNT_DIR}/engine/qcommon/q_math.c
+ ${MOUNT_DIR}/engine/qcommon/q_shared.cpp
+ ${MOUNT_DIR}/engine/qcommon/q_math.cpp
)
set( OPENEXRLIST
@@ -148,59 +159,59 @@ set( RENDERERLIST
set( RENDERERGLLIST
${MOUNT_DIR}/engine/rendererGL/gl_shader.cpp
- ${MOUNT_DIR}/engine/rendererGL/tr_animation_mdm.c
- ${MOUNT_DIR}/engine/rendererGL/tr_animation.c
+ ${MOUNT_DIR}/engine/rendererGL/tr_animation_mdm.cpp
+ ${MOUNT_DIR}/engine/rendererGL/tr_animation.cpp
${MOUNT_DIR}/engine/rendererGL/tr_backend.cpp
- ${MOUNT_DIR}/engine/rendererGL/tr_bsp.c
- ${MOUNT_DIR}/engine/rendererGL/tr_cmds.c
- ${MOUNT_DIR}/engine/rendererGL/tr_curve.c
- ${MOUNT_DIR}/engine/rendererGL/tr_decals.c
- ${MOUNT_DIR}/engine/rendererGL/tr_fbo.c
- ${MOUNT_DIR}/engine/rendererGL/tr_flares.c
- ${MOUNT_DIR}/engine/rendererGL/tr_fog.c
- ${MOUNT_DIR}/engine/rendererGL/tr_font.c
- ${MOUNT_DIR}/engine/rendererGL/tr_image.c
- ${MOUNT_DIR}/engine/rendererGL/tr_image_dds.c
+ ${MOUNT_DIR}/engine/rendererGL/tr_bsp.cpp
+ ${MOUNT_DIR}/engine/rendererGL/tr_cmds.cpp
+ ${MOUNT_DIR}/engine/rendererGL/tr_curve.cpp
+ ${MOUNT_DIR}/engine/rendererGL/tr_decals.cpp
+ ${MOUNT_DIR}/engine/rendererGL/tr_fbo.cpp
+ ${MOUNT_DIR}/engine/rendererGL/tr_flares.cpp
+ ${MOUNT_DIR}/engine/rendererGL/tr_fog.cpp
+ ${MOUNT_DIR}/engine/rendererGL/tr_font.cpp
+ ${MOUNT_DIR}/engine/rendererGL/tr_image.cpp
+ ${MOUNT_DIR}/engine/rendererGL/tr_image_dds.cpp
${MOUNT_DIR}/engine/rendererGL/tr_image_exr.cpp
- ${MOUNT_DIR}/engine/rendererGL/tr_image_jpg.c
- ${MOUNT_DIR}/engine/rendererGL/tr_image_png.c
- ${MOUNT_DIR}/engine/rendererGL/tr_image_tga.c
- ${MOUNT_DIR}/engine/rendererGL/tr_image_webp.c
+ ${MOUNT_DIR}/engine/rendererGL/tr_image_jpg.cpp
+ ${MOUNT_DIR}/engine/rendererGL/tr_image_png.cpp
+ ${MOUNT_DIR}/engine/rendererGL/tr_image_tga.cpp
+ ${MOUNT_DIR}/engine/rendererGL/tr_image_webp.cpp
${MOUNT_DIR}/engine/rendererGL/tr_init.cpp
- ${MOUNT_DIR}/engine/rendererGL/tr_light.c
- ${MOUNT_DIR}/engine/rendererGL/tr_main.c
- ${MOUNT_DIR}/engine/rendererGL/tr_marks.c
- ${MOUNT_DIR}/engine/rendererGL/tr_mesh.c
- ${MOUNT_DIR}/engine/rendererGL/tr_model.c
- ${MOUNT_DIR}/engine/rendererGL/tr_model_md3.c
- ${MOUNT_DIR}/engine/rendererGL/tr_model_md5.c
- ${MOUNT_DIR}/engine/rendererGL/tr_model_mdc.c
- ${MOUNT_DIR}/engine/rendererGL/tr_model_mdm.c
- ${MOUNT_DIR}/engine/rendererGL/tr_model_psk.c
- ${MOUNT_DIR}/engine/rendererGL/tr_model_skel.c
- ${MOUNT_DIR}/engine/rendererGL/tr_noise.c
- ${MOUNT_DIR}/engine/rendererGL/tr_scene.c
+ ${MOUNT_DIR}/engine/rendererGL/tr_light.cpp
+ ${MOUNT_DIR}/engine/rendererGL/tr_main.cpp
+ ${MOUNT_DIR}/engine/rendererGL/tr_marks.cpp
+ ${MOUNT_DIR}/engine/rendererGL/tr_mesh.cpp
+ ${MOUNT_DIR}/engine/rendererGL/tr_model.cpp
+ ${MOUNT_DIR}/engine/rendererGL/tr_model_md3.cpp
+ ${MOUNT_DIR}/engine/rendererGL/tr_model_md5.cpp
+ ${MOUNT_DIR}/engine/rendererGL/tr_model_mdc.cpp
+ ${MOUNT_DIR}/engine/rendererGL/tr_model_mdm.cpp
+ ${MOUNT_DIR}/engine/rendererGL/tr_model_psk.cpp
+ ${MOUNT_DIR}/engine/rendererGL/tr_model_skel.cpp
+ ${MOUNT_DIR}/engine/rendererGL/tr_noise.cpp
+ ${MOUNT_DIR}/engine/rendererGL/tr_scene.cpp
${MOUNT_DIR}/engine/rendererGL/tr_shade.cpp
- ${MOUNT_DIR}/engine/rendererGL/tr_shade_calc.c
- ${MOUNT_DIR}/engine/rendererGL/tr_shader.c
- ${MOUNT_DIR}/engine/rendererGL/tr_shadows.c
- ${MOUNT_DIR}/engine/rendererGL/tr_skin.c
+ ${MOUNT_DIR}/engine/rendererGL/tr_shade_calc.cpp
+ ${MOUNT_DIR}/engine/rendererGL/tr_shader.cpp
+ ${MOUNT_DIR}/engine/rendererGL/tr_shadows.cpp
+ ${MOUNT_DIR}/engine/rendererGL/tr_skin.cpp
${MOUNT_DIR}/engine/rendererGL/tr_sky.cpp
- ${MOUNT_DIR}/engine/rendererGL/tr_surface.c
- ${MOUNT_DIR}/engine/rendererGL/tr_vbo.c
+ ${MOUNT_DIR}/engine/rendererGL/tr_surface.cpp
+ ${MOUNT_DIR}/engine/rendererGL/tr_vbo.cpp
${MOUNT_DIR}/engine/rendererGL/tr_world.cpp
)
set( SERVERLIST
- ${MOUNT_DIR}/engine/server/sv_bot.c
- ${MOUNT_DIR}/engine/server/sv_ccmds.c
- ${MOUNT_DIR}/engine/server/sv_client.c
- ${MOUNT_DIR}/engine/server/sv_game.c
- ${MOUNT_DIR}/engine/server/sv_init.c
- ${MOUNT_DIR}/engine/server/sv_main.c
- ${MOUNT_DIR}/engine/server/sv_net_chan.c
- ${MOUNT_DIR}/engine/server/sv_snapshot.c
- ${MOUNT_DIR}/engine/server/sv_world.c
+ ${MOUNT_DIR}/engine/server/sv_bot.cpp
+ ${MOUNT_DIR}/engine/server/sv_ccmds.cpp
+ ${MOUNT_DIR}/engine/server/sv_client.cpp
+ ${MOUNT_DIR}/engine/server/sv_game.cpp
+ ${MOUNT_DIR}/engine/server/sv_init.cpp
+ ${MOUNT_DIR}/engine/server/sv_main.cpp
+ ${MOUNT_DIR}/engine/server/sv_net_chan.cpp
+ ${MOUNT_DIR}/engine/server/sv_snapshot.cpp
+ ${MOUNT_DIR}/engine/server/sv_world.cpp
)
set( COLLISIONMODEL
@@ -220,30 +231,32 @@ set( QCOMMONLIST
${MOUNT_DIR}/engine/asm/snapvector.c
${MOUNT_DIR}/engine/qcommon/cm_api.cpp
${MOUNT_DIR}/engine/qcommon/cm_load.c
- ${MOUNT_DIR}/engine/qcommon/cm_trisoup.c
- ${MOUNT_DIR}/engine/qcommon/cm_patch.c
- ${MOUNT_DIR}/engine/qcommon/cm_polylib.c
- ${MOUNT_DIR}/engine/qcommon/cm_test.c
- ${MOUNT_DIR}/engine/qcommon/cm_trace.c
- ${MOUNT_DIR}/engine/qcommon/cmd.c
- ${MOUNT_DIR}/engine/qcommon/common.c
- ${MOUNT_DIR}/engine/qcommon/crypto.c
- ${MOUNT_DIR}/engine/qcommon/cvar.c
- ${MOUNT_DIR}/engine/qcommon/files.c
- ${MOUNT_DIR}/engine/qcommon/htable.c
- ${MOUNT_DIR}/engine/qcommon/huffman.c
- ${MOUNT_DIR}/engine/qcommon/md4.c
- ${MOUNT_DIR}/engine/qcommon/md5.c
- ${MOUNT_DIR}/engine/qcommon/msg.c
- ${MOUNT_DIR}/engine/qcommon/net_chan.c
- ${MOUNT_DIR}/engine/qcommon/net_ip.c
- ${MOUNT_DIR}/engine/qcommon/net_http.c
- ${MOUNT_DIR}/engine/qcommon/parse.c
- ${MOUNT_DIR}/engine/qcommon/unzip.c
- ${MOUNT_DIR}/engine/qcommon/ioapi.c
- ${MOUNT_DIR}/engine/qcommon/vm.c
- ${MOUNT_DIR}/engine/qcommon/vm_x86.c
- ${MOUNT_DIR}/engine/qcommon/vm_interpreted.c
+ ${MOUNT_DIR}/engine/qcommon/cm_load.cpp
+ ${MOUNT_DIR}/engine/qcommon/cm_trisoup.cpp
+ ${MOUNT_DIR}/engine/qcommon/cm_patch.cpp
+ ${MOUNT_DIR}/engine/qcommon/cm_polylib.cpp
+ ${MOUNT_DIR}/engine/qcommon/cm_test.cpp
+ ${MOUNT_DIR}/engine/qcommon/cm_trace.cpp
+ ${MOUNT_DIR}/engine/qcommon/cmd.cpp
+ ${MOUNT_DIR}/engine/qcommon/common.cpp
+ ${MOUNT_DIR}/engine/qcommon/crypto.cpp
+ ${MOUNT_DIR}/engine/qcommon/cvar.cpp
+ ${MOUNT_DIR}/engine/qcommon/files.cpp
+ ${MOUNT_DIR}/engine/qcommon/htable.cpp
+ ${MOUNT_DIR}/engine/qcommon/huffman.cpp
+ ${MOUNT_DIR}/engine/qcommon/md4.cpp
+ ${MOUNT_DIR}/engine/qcommon/md5.cpp
+ ${MOUNT_DIR}/engine/qcommon/msg.cpp
+ ${MOUNT_DIR}/engine/qcommon/net_chan.cpp
+ ${MOUNT_DIR}/engine/qcommon/net_ip.cpp
+ ${MOUNT_DIR}/engine/qcommon/net_http.cpp
+ ${MOUNT_DIR}/engine/qcommon/parse.cpp
+ ${MOUNT_DIR}/engine/qcommon/vm.cpp
+)
+
+set( FRAMEWORKLIST
+ ${MOUNT_DIR}/engine/framework/Unzip.c
+ ${MOUNT_DIR}/engine/framework/ioapi.c
)
if( USE_PHYSICS )
@@ -258,51 +271,42 @@ endif()
if( USE_MYSQL )
set( DATABASELIST
- ${MOUNT_DIR}/engine/database/db_main.c
- ${MOUNT_DIR}/engine/database/db_mysql.c
+ ${MOUNT_DIR}/engine/database/db_main.cpp
+ ${MOUNT_DIR}/engine/database/db_mysql.cpp
)
endif()
set( CLIENTLIST
- ${MOUNT_DIR}/engine/client/cin_ogm.c
- ${MOUNT_DIR}/engine/client/cl_avi.c
- ${MOUNT_DIR}/engine/client/cl_cgame.c
- ${MOUNT_DIR}/engine/client/cl_cin.c
- ${MOUNT_DIR}/engine/client/cl_console.c
- ${MOUNT_DIR}/engine/client/cl_download.c
- ${MOUNT_DIR}/engine/client/cl_input.c
- ${MOUNT_DIR}/engine/client/cl_irc.c
- ${MOUNT_DIR}/engine/client/cl_keys.c
- ${MOUNT_DIR}/engine/client/cl_main.c
- ${MOUNT_DIR}/engine/client/cl_net_chan.c
- ${MOUNT_DIR}/engine/client/cl_parse.c
- ${MOUNT_DIR}/engine/client/cl_scrn.c
- ${MOUNT_DIR}/engine/client/cl_text.c
- ${MOUNT_DIR}/engine/client/cl_ui.c
- ${MOUNT_DIR}/engine/client/snd_adpcm.c
- ${MOUNT_DIR}/engine/client/snd_codec.c
- ${MOUNT_DIR}/engine/client/snd_codec_ogg.c
- ${MOUNT_DIR}/engine/client/snd_codec_wav.c
- ${MOUNT_DIR}/engine/client/snd_dma.c
- ${MOUNT_DIR}/engine/client/snd_load.c
- ${MOUNT_DIR}/engine/client/snd_mem.c
- ${MOUNT_DIR}/engine/client/snd_mix.c
- ${MOUNT_DIR}/engine/client/snd_wavelet.c
+ ${MOUNT_DIR}/engine/client/cin_ogm.cpp
+ ${MOUNT_DIR}/engine/client/cl_avi.cpp
+ ${MOUNT_DIR}/engine/client/cl_cgame.cpp
+ ${MOUNT_DIR}/engine/client/cl_cin.cpp
+ ${MOUNT_DIR}/engine/client/cl_console.cpp
+ ${MOUNT_DIR}/engine/client/cl_input.cpp
+ ${MOUNT_DIR}/engine/client/cl_irc.cpp
+ ${MOUNT_DIR}/engine/client/cl_main.cpp
+ ${MOUNT_DIR}/engine/client/cl_net_chan.cpp
+ ${MOUNT_DIR}/engine/client/cl_parse.cpp
+ ${MOUNT_DIR}/engine/client/cl_scrn.cpp
+ ${MOUNT_DIR}/engine/client/cl_ui.cpp
+ ${MOUNT_DIR}/engine/framework/KeyInput.cpp
+ ${MOUNT_DIR}/engine/snd_system/snd_adpcm.cpp
+ ${MOUNT_DIR}/engine/snd_system/snd_codec.cpp
+ ${MOUNT_DIR}/engine/snd_system/snd_codec_ogg.cpp
+ ${MOUNT_DIR}/engine/snd_system/snd_codec_wav.cpp
+ ${MOUNT_DIR}/engine/snd_system/snd_dma.cpp
+ ${MOUNT_DIR}/engine/snd_system/snd_openal.cpp
+ ${MOUNT_DIR}/engine/snd_system/snd_main.cpp
+ ${MOUNT_DIR}/engine/snd_system/snd_mem.cpp
+ ${MOUNT_DIR}/engine/snd_system/snd_mix.cpp
+ ${MOUNT_DIR}/engine/snd_system/snd_wavelet.cpp
+ ${MOUNT_DIR}/engine/snd_system/qal.cpp
)
if( USE_MUMBLE )
- set( CLIENTLIST ${CLIENTLIST} ${MOUNT_DIR}/engine/client/libmumblelink.c )
+ set( CLIENTLIST ${CLIENTLIST} ${MOUNT_DIR}/engine/client/libmumblelink.cpp )
endif()
-set( ALLIST
- ${MOUNT_DIR}/engine/snd_openal/qal.c
- ${MOUNT_DIR}/engine/snd_openal/snd_al_buffers.c
- ${MOUNT_DIR}/engine/snd_openal/snd_al_main.c
- ${MOUNT_DIR}/engine/snd_openal/snd_al_music.c
- ${MOUNT_DIR}/engine/snd_openal/snd_al_sources.c
- ${MOUNT_DIR}/engine/snd_openal/snd_al_stream.c
-)
-
if( USE_CPUINFO )
set( CPUINFOLIST
${MOUNT_DIR}/libs/cpuinfo/CPUInfo.c
@@ -312,60 +316,58 @@ endif()
if( ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" )
set( SDLBASELIST
- ${MOUNT_DIR}/engine/sys/sys_unix.c
+ ${MOUNT_DIR}/engine/sys/sys_unix.cpp
${MOUNT_DIR}/engine/sys/sys_osx.m
- ${MOUNT_DIR}/engine/sys/sys_main.c
- ${MOUNT_DIR}/engine/sys/con_log.c
- ${MOUNT_DIR}/engine/sys/con_${CONSOLE}.c
+ ${MOUNT_DIR}/engine/sys/sys_main.cpp
+ ${MOUNT_DIR}/engine/sys/con_log.cpp
+ ${MOUNT_DIR}/engine/sys/con_${CONSOLE}.cpp
)
else()
set( SDLBASELIST
- ${MOUNT_DIR}/engine/sys/sys_${PLATFORM}.c
- ${MOUNT_DIR}/engine/sys/sys_main.c
- ${MOUNT_DIR}/engine/sys/con_log.c
- ${MOUNT_DIR}/engine/sys/con_${CONSOLE}.c
+ ${MOUNT_DIR}/engine/sys/sys_${PLATFORM}.cpp
+ ${MOUNT_DIR}/engine/sys/sys_main.cpp
+ ${MOUNT_DIR}/engine/sys/con_log.cpp
+ ${MOUNT_DIR}/engine/sys/con_${CONSOLE}.cpp
)
endif()
if( USE_CURSES )
- set( SDLBASELIST ${SDLBASELIST} ${MOUNT_DIR}/engine/sys/con_curses.c )
+ set( SDLBASELIST ${SDLBASELIST} ${MOUNT_DIR}/engine/sys/con_curses.cpp )
endif()
set( SDLLIST
- ${MOUNT_DIR}/engine/sys/sdl_input.c
- ${MOUNT_DIR}/engine/sys/sdl_snd.c
+ ${MOUNT_DIR}/engine/sys/sdl_input.cpp
+ ${MOUNT_DIR}/engine/sys/sdl_snd.cpp
)
set( BOTLIBLIST
- ${MOUNT_DIR}/engine/botlib/l_struct.c
- ${MOUNT_DIR}/engine/botlib/l_crc.c
- ${MOUNT_DIR}/engine/botlib/l_libvar.c
- ${MOUNT_DIR}/engine/botlib/l_log.c
- ${MOUNT_DIR}/engine/botlib/l_memory.c
- ${MOUNT_DIR}/engine/botlib/l_precomp.c
- ${MOUNT_DIR}/engine/botlib/l_script.c
- ${MOUNT_DIR}/engine/botlib/be_aas_bspq3.c
- ${MOUNT_DIR}/engine/botlib/be_aas_cluster.c
- ${MOUNT_DIR}/engine/botlib/be_aas_debug.c
- ${MOUNT_DIR}/engine/botlib/be_aas_entity.c
- ${MOUNT_DIR}/engine/botlib/be_aas_file.c
- ${MOUNT_DIR}/engine/botlib/be_aas_main.c
- ${MOUNT_DIR}/engine/botlib/be_aas_move.c
- ${MOUNT_DIR}/engine/botlib/be_aas_optimize.c
- ${MOUNT_DIR}/engine/botlib/be_aas_reach.c
- ${MOUNT_DIR}/engine/botlib/be_aas_route.c
- ${MOUNT_DIR}/engine/botlib/be_aas_routealt.c
- ${MOUNT_DIR}/engine/botlib/be_aas_routetable.c
- ${MOUNT_DIR}/engine/botlib/be_aas_sample.c
- ${MOUNT_DIR}/engine/botlib/be_ai_char.c
- ${MOUNT_DIR}/engine/botlib/be_ai_chat.c
- ${MOUNT_DIR}/engine/botlib/be_ai_gen.c
- ${MOUNT_DIR}/engine/botlib/be_ai_goal.c
- ${MOUNT_DIR}/engine/botlib/be_ai_move.c
- ${MOUNT_DIR}/engine/botlib/be_ai_weap.c
- ${MOUNT_DIR}/engine/botlib/be_ai_weight.c
- ${MOUNT_DIR}/engine/botlib/be_ea.c
- ${MOUNT_DIR}/engine/botlib/be_interface.c
+ ${MOUNT_DIR}/engine/botlib/l_struct.cpp
+ ${MOUNT_DIR}/engine/botlib/l_crc.cpp
+ ${MOUNT_DIR}/engine/botlib/l_libvar.cpp
+ ${MOUNT_DIR}/engine/botlib/l_log.cpp
+ ${MOUNT_DIR}/engine/botlib/l_memory.cpp
+ ${MOUNT_DIR}/engine/botlib/be_aas_bspq3.cpp
+ ${MOUNT_DIR}/engine/botlib/be_aas_cluster.cpp
+ ${MOUNT_DIR}/engine/botlib/be_aas_debug.cpp
+ ${MOUNT_DIR}/engine/botlib/be_aas_entity.cpp
+ ${MOUNT_DIR}/engine/botlib/be_aas_file.cpp
+ ${MOUNT_DIR}/engine/botlib/be_aas_main.cpp
+ ${MOUNT_DIR}/engine/botlib/be_aas_move.cpp
+ ${MOUNT_DIR}/engine/botlib/be_aas_optimize.cpp
+ ${MOUNT_DIR}/engine/botlib/be_aas_reach.cpp
+ ${MOUNT_DIR}/engine/botlib/be_aas_route.cpp
+ ${MOUNT_DIR}/engine/botlib/be_aas_routealt.cpp
+ ${MOUNT_DIR}/engine/botlib/be_aas_routetable.cpp
+ ${MOUNT_DIR}/engine/botlib/be_aas_sample.cpp
+ ${MOUNT_DIR}/engine/botlib/be_ai_char.cpp
+ ${MOUNT_DIR}/engine/botlib/be_ai_chat.cpp
+ ${MOUNT_DIR}/engine/botlib/be_ai_gen.cpp
+ ${MOUNT_DIR}/engine/botlib/be_ai_goal.cpp
+ ${MOUNT_DIR}/engine/botlib/be_ai_move.cpp
+ ${MOUNT_DIR}/engine/botlib/be_ai_weap.cpp
+ ${MOUNT_DIR}/engine/botlib/be_ai_weight.cpp
+ ${MOUNT_DIR}/engine/botlib/be_ea.cpp
+ ${MOUNT_DIR}/engine/botlib/be_interface.cpp
)
@@ -547,6 +549,77 @@ set( UILIST
${MOUNT_DIR}/engine/qcommon/q_shared.c
)
+set( QAGAMELISTBASE
+ ${BASE_DIR}/game/bg_misc.cpp
+ ${BASE_DIR}/game/bg_pmove.cpp
+ ${BASE_DIR}/game/bg_slidemove.cpp
+ ${BASE_DIR}/game/g_active.cpp
+ ${BASE_DIR}/game/g_client.cpp
+ ${BASE_DIR}/game/g_cmds.cpp
+ ${BASE_DIR}/game/g_combat.cpp
+ ${BASE_DIR}/game/g_maprotation.cpp
+ ${BASE_DIR}/game/g_mem.cpp
+ ${BASE_DIR}/game/g_main.cpp
+ ${BASE_DIR}/game/g_misc.cpp
+ ${BASE_DIR}/game/g_missile.cpp
+ ${BASE_DIR}/game/g_mover.cpp
+ ${BASE_DIR}/game/g_ptr.cpp
+ ${BASE_DIR}/game/g_spawn.cpp
+ ${BASE_DIR}/game/g_svcmds.cpp
+ ${BASE_DIR}/game/g_api.cpp
+ ${BASE_DIR}/game/g_target.cpp
+ ${BASE_DIR}/game/g_trigger.cpp
+ ${BASE_DIR}/game/g_team.cpp
+ ${BASE_DIR}/game/g_utils.cpp
+ ${BASE_DIR}/game/g_buildable.cpp
+ ${BASE_DIR}/game/g_weapon.cpp
+ ${MOUNT_DIR}/engine/qcommon/q_math.cpp
+ ${MOUNT_DIR}/engine/qcommon/q_shared.cpp
+)
+
+set( CGAMELISTBASE
+ ${BASE_DIR}/cgame/cg_main.cpp
+ ${BASE_DIR}/game/bg_misc.cpp
+ ${BASE_DIR}/game/bg_pmove.cpp
+ ${BASE_DIR}/game/bg_slidemove.cpp
+ ${BASE_DIR}/cgame/cg_consolecmds.cpp
+ ${BASE_DIR}/cgame/cg_buildable.cpp
+ ${BASE_DIR}/cgame/cg_animation.cpp
+ ${BASE_DIR}/cgame/cg_animmapobj.cpp
+ ${BASE_DIR}/cgame/cg_draw.cpp
+ ${BASE_DIR}/cgame/cg_drawtools.cpp
+ ${BASE_DIR}/cgame/cg_ents.cpp
+ ${BASE_DIR}/cgame/cg_event.cpp
+ ${BASE_DIR}/cgame/cg_marks.cpp
+ ${BASE_DIR}/cgame/cg_players.cpp
+ ${BASE_DIR}/cgame/cg_playerstate.cpp
+ ${BASE_DIR}/cgame/cg_predict.cpp
+ ${BASE_DIR}/cgame/cg_servercmds.cpp
+ ${BASE_DIR}/cgame/cg_snapshot.cpp
+ ${BASE_DIR}/cgame/cg_view.cpp
+ ${BASE_DIR}/cgame/cg_weapons.cpp
+ ${BASE_DIR}/cgame/cg_scanner.cpp
+ ${BASE_DIR}/cgame/cg_attachment.cpp
+ ${BASE_DIR}/cgame/cg_trails.cpp
+ ${BASE_DIR}/cgame/cg_particles.cpp
+ ${BASE_DIR}/cgame/cg_tutorial.cpp
+ ${BASE_DIR}/ui/ui_shared.cpp
+ ${MOUNT_DIR}/engine/qcommon/q_math.cpp
+ ${MOUNT_DIR}/engine/qcommon/q_shared.cpp
+)
+
+set( UILISTBASE
+ ${BASE_DIR}/ui/ui_atoms.cpp
+ ${BASE_DIR}/ui/ui_gameinfo.cpp
+ ${BASE_DIR}/ui/ui_main.cpp
+ ${BASE_DIR}/ui/ui_players.cpp
+ ${BASE_DIR}/ui/ui_shared.cpp
+ ${BASE_DIR}/ui/ui_api.cpp
+ ${BASE_DIR}/game/bg_misc.cpp
+ ${MOUNT_DIR}/engine/qcommon/q_math.cpp
+ ${MOUNT_DIR}/engine/qcommon/q_shared.cpp
+)
+
set( OWMAPLIST
${MOUNT_DIR}/tools/common/cmdlib.c
${MOUNT_DIR}/tools/common/imagelib.c
@@ -785,6 +858,42 @@ if( BUILD_GAME_SO_ET )
)
endif()
+###############################
+# Build Game/Cgame/Ui DLL/.so #
+###############################
+
+if( BUILD_GAME_SO_BASE )
+ add_library( game SHARED ${SHAREDLIST} ${QAGAMELISTBASE} )
+ set_property( TARGET game PROPERTY COMPILE_DEFINITIONS GAME GAMEDLL USE_REFENTITY_ANIMATIONSYSTEM )
+ set_target_properties( game PROPERTIES
+ OUTPUT_NAME "qagame.mp.${BUILD_ARCH}"
+ PREFIX ""
+ LIBRARY_OUTPUT_DIRECTORY "base"
+ )
+ target_link_libraries( game -lm )
+ add_library( cgame SHARED ${SHAREDLIST} ${CGAMELISTBASE} )
+ set_property( TARGET cgame PROPERTY COMPILE_DEFINITIONS CGAME CGAMEDLL USE_REFENTITY_ANIMATIONSYSTEM )
+ set_target_properties( cgame PROPERTIES
+ OUTPUT_NAME "cgame.mp.${BUILD_ARCH}"
+ PREFIX ""
+ LIBRARY_OUTPUT_DIRECTORY "base"
+ )
+ target_link_libraries( cgame -lm )
+ add_library( ui SHARED ${SHAREDLIST} ${UILISTBASE} )
+ set_property( TARGET ui PROPERTY COMPILE_DEFINITIONS UI UIDLL USE_REFENTITY_ANIMATIONSYSTEM )
+ set_target_properties( ui PROPERTIES
+ OUTPUT_NAME "ui.mp.${BUILD_ARCH}"
+ PREFIX ""
+ LIBRARY_OUTPUT_DIRECTORY "base"
+ )
+ target_link_libraries( ui -lm )
+ install( TARGETS game cgame ui
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib
+ )
+endif()
+
###################
# Build Renderers #
###################
@@ -823,7 +932,7 @@ if( BUILD_OLD_RENDERER OR BUILD_NEW_RENDERER )
target_link_libraries(glsl_optimizer glcpp-library mesa)
endif()
if( BUILD_NEW_RENDERER )
- add_library( rendererGL SHARED ${SHAREDLIST} ${OPENEXRLIST} ${RENDERERGLLIST} ${MOUNT_DIR}/engine/sys/sdl_glimp.c ${MOUNT_DIR}/engine/sys/sdl_gamma.c )
+ add_library( rendererGL SHARED ${SHAREDLIST} ${OPENEXRLIST} ${RENDERERGLLIST} ${MOUNT_DIR}/engine/sys/sdl_glimp.cpp ${MOUNT_DIR}/engine/sys/sdl_gamma.cpp )
include_directories( ${PNG_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR} ${JPEG_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${GLEW_INCLUDE_DIR} ${SDL_INCLUDE_DIR} )
set_property( TARGET rendererGL PROPERTY COMPILE_DEFINITIONS BUILD_FREETYPE FT_FREETYPE USE_XREAL_RENDERER USE_REFENTITY_ANIMATIONSYSTEM )
if( USE_GLSL_OPTIMIZER )
@@ -846,7 +955,7 @@ if( BUILD_OLD_RENDERER OR BUILD_NEW_RENDERER )
endif()
if( BUILD_OLD_RENDERER )
- add_library( renderer SHARED ${RENDERERLIST} ${MOUNT_DIR}/engine/sys/sdl_glimp.c ${MOUNT_DIR}/engine/sys/sdl_gamma.c ${SHAREDLIST} )
+ add_library( renderer SHARED ${RENDERERLIST} ${MOUNT_DIR}/engine/sys/sdl_glimp.cpp ${MOUNT_DIR}/engine/sys/sdl_gamma.cpp ${SHAREDLIST} )
include_directories( ${PNG_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR} ${JPEG_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${GLEW_INCLUDE_DIR} ${SDL_INCLUDE_DIR} )
set_property( TARGET renderer PROPERTY COMPILE_DEFINITIONS BUILD_FREETYPE USE_REFENTITY_ANIMATIONSYSTEM )
target_link_libraries( renderer ${PNG_LIBRARY} ${SDL_LIBRARY} ${GLEW_LIBRARY} ${OPENGL_LIBRARY} ${JPEG_LIBRARY} ${FREETYPE_LIBRARY} )
@@ -871,8 +980,8 @@ endif()
if( BUILD_CLIENT )
# Setup target client
add_executable( client ${SERVERLIST} ${CLIENTLIST} ${SDLBASELIST}
- ${CPUINFOLIST} ${SDLLIST} ${QCOMMONLIST} ${COLLISIONMODEL} ${SHAREDLIST} ${CRYPTOLIST}
- ${DATABASELIST} ${BOTLIBLIST} ${IDLIBLIST} ${MOUNT_DIR}/engine/qcommon/dl_main_curl.c ${SPEEXLIST} )
+ ${CPUINFOLIST} ${SDLLIST} ${QCOMMONLIST} ${FRAMEWORKLIST} ${COLLISIONMODEL} ${SHAREDLIST} ${CRYPTOLIST}
+ ${DATABASELIST} ${BOTLIBLIST} ${IDLIBLIST} ${MOUNT_DIR}/engine/qcommon/dl_main_curl.cpp ${SPEEXLIST} )
add_dependencies( client rendererGL )
include_directories( ${MOUNT_DIR}/libs/cpuinfo ${NEWTON_INCLUDES} )
target_link_libraries( client ${OS_LIBRARIES} ${NEWTON_LIBRARY} )
@@ -985,38 +1094,18 @@ if( BUILD_CLIENT )
endif()
################
-# Build OpenAL #
-################
-
-if( USE_OPENAL )
- find_package( OpenAL REQUIRED )
- add_library( al SHARED ${ALLIST} )
- include_directories( ${OPENAL_INCLUDE_DIRS} )
- target_link_libraries( al ${OPENAL_LIBRARY} )
- set_property( TARGET al PROPERTY COMPILE_DEFINITIONS )
- set_target_properties( al PROPERTIES OUTPUT_NAME "snd_openal" PREFIX "" )
- if( USE_OPENAL_DLOPEN )
- set_property( TARGET al APPEND PROPERTY COMPILE_DEFINITIONS USE_OPENAL_DLOPEN )
- target_link_libraries( al ${CMAKE_DL_LIBS} )
- endif()
- if( USE_VOIP )
- set_property( TARGET al APPEND PROPERTY COMPILE_DEFINITIONS USE_VOIP FLOATING_POINT )
- endif()
-endif()
-
-################
# Build Server #
################
if( BUILD_SERVER )
# Setup the target Server
- add_executable( server ${SERVERLIST} ${SDLBASELIST} ${CPUINFOLIST}
- ${QCOMMONLIST} ${SHAREDLIST} ${DATABASELIST} ${CRYPTOLIST}
- ${MOUNT_DIR}/engine/null/null_client.c
- ${MOUNT_DIR}/engine/null/null_input.c ${MOUNT_DIR}/engine/null/null_snddma.c
- ${MOUNT_DIR}/engine/qcommon/dl_main_stubs.c )
+ add_executable( server ${SERVERLIST} ${SDLBASELIST} ${CPUINFOLIST} ${BOTLIBLIST}
+ ${QCOMMONLIST} ${FRAMEWORKLIST} ${IDLIBLIST} ${SHAREDLIST} ${DATABASELIST} ${CRYPTOLIST} ${COLLISIONMODEL}
+ ${MOUNT_DIR}/engine/null/null_client.cpp
+ ${MOUNT_DIR}/engine/null/null_input.cpp ${MOUNT_DIR}/engine/null/null_snddma.cpp
+ ${MOUNT_DIR}/engine/qcommon/dl_main_stubs.cpp )
include_directories( ${MOUNT_DIR}/libs/cpuinfo ${NEWTON_INCLUDES} )
- target_link_libraries( server ${OS_LIBRARIES} ${BOTLIBLIST} ${NEWTON_LIBRARY} )
+ target_link_libraries( server ${OS_LIBRARIES} ${NEWTON_LIBRARY} )
set_property( TARGET server APPEND PROPERTY COMPILE_DEFINITIONS BOTLIB BOTLIB_STATIC DEDICATED COMPAT_ET USE_CRYPTO )
set_target_properties( server PROPERTIES OUTPUT_NAME "OpenWolfded.${BUILD_ARCH}" PREFIX "" LINKER_LANGUAGE CXX )
install( TARGETS server
@@ -1074,16 +1163,16 @@ endif()
if( BUILD_AUTOUPDATE_SERVER )
# Setup the target Server
- add_executable( server ${SERVERLIST} ${SDLBASELIST} ${CPUINFOLIST}
- ${QCOMMONLIST} ${SHAREDLIST} ${DATABASELIST} ${CRYPTOLIST}
- ${MOUNT_DIR}/engine/null/null_client.c
- ${MOUNT_DIR}/engine/null/null_input.c ${MOUNT_DIR}/engine/null/null_snddma.c
- ${MOUNT_DIR}/engine/qcommon/dl_main_stubs.c )
+ add_executable( autoupdateserver ${SERVERLIST} ${SDLBASELIST} ${CPUINFOLIST} ${COLLISIONMODEL}
+ ${QCOMMONLIST} ${FRAMEWORKLIST} ${IDLIBLIST} ${SHAREDLIST} ${DATABASELIST} ${CRYPTOLIST} ${BOTLIBLIST}
+ ${MOUNT_DIR}/engine/null/null_client.cpp
+ ${MOUNT_DIR}/engine/null/null_input.cpp ${MOUNT_DIR}/engine/null/null_snddma.cpp
+ ${MOUNT_DIR}/engine/qcommon/dl_main_stubs.cpp )
include_directories( ${MOUNT_DIR}/libs/cpuinfo ${NEWTON_INCLUDES} )
- target_link_libraries( server ${OS_LIBRARIES} )
- set_property( TARGET server APPEND PROPERTY COMPILE_DEFINITIONS DEDICATED COMPAT_ET BOTLIB BOTLIB_STATIC USE_CRYPTO UPDATE_SERVER )
- set_target_properties( server PROPERTIES OUTPUT_NAME "OpenWolfupdateded.${BUILD_ARCH}" PREFIX "" LINKER_LANGUAGE CXX )
- install( TARGETS server
+ target_link_libraries( autoupdateserver ${OS_LIBRARIES} )
+ set_property( TARGET autoupdateserver APPEND PROPERTY COMPILE_DEFINITIONS DEDICATED COMPAT_ET BOTLIB BOTLIB_STATIC USE_CRYPTO UPDATE_SERVER )
+ set_target_properties( autoupdateserver PROPERTIES OUTPUT_NAME "OpenWolfupdateded.${BUILD_ARCH}" PREFIX "" LINKER_LANGUAGE CXX )
+ install( TARGETS autoupdateserver
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
@@ -1100,24 +1189,24 @@ if( BUILD_AUTOUPDATE_SERVER )
else()
find_package( Nettle REQUIRED )
include_directories( ${NETTLE_INCLUDE_DIRS} )
- target_link_libraries( server ${NETTLE_LIBRARIES} )
+ target_link_libraries( autoupdateserver ${NETTLE_LIBRARIES} )
endif()
include_directories( ${SDL_INCLUDE_DIR} ${GMP_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS} )
- target_link_libraries( server ${SDL_LIBRARY} ${GMP_LIBRARIES} ${ZLIB_LIBRARIES} ${CURL_LIBRARIES} )
+ target_link_libraries( autoupdateserver ${SDL_LIBRARY} ${GMP_LIBRARIES} ${ZLIB_LIBRARIES} ${CURL_LIBRARIES} )
# The following section finds the OPTIONAL dependencies and makes them available to the target
if( USE_MYSQL )
find_package( MySQL REQUIRED )
- set_property( TARGET server APPEND PROPERTY COMPILE_DEFINITIONS ET_MYSQL )
- target_link_libraries( server ${MYSQL_LIBRARIES} )
+ set_property( TARGET autoupdateserver APPEND PROPERTY COMPILE_DEFINITIONS ET_MYSQL )
+ target_link_libraries( autoupdateserver ${MYSQL_LIBRARIES} )
endif()
if( USE_CURSES )
set( CURSES_NEED_NCURSES 1 ) # Tells FindCurses that ncurses is required
find_package( Curses REQUIRED )
- set_property( TARGET server APPEND PROPERTY COMPILE_DEFINITIONS USE_CURSES )
+ set_property( TARGET autoupdateserver APPEND PROPERTY COMPILE_DEFINITIONS USE_CURSES )
include_directories( ${CURSES_INCLUDE_DIR} )
- target_link_libraries( server ${CURSES_LIBRARIES} )
+ target_link_libraries( autoupdateserver ${CURSES_LIBRARIES} )
endif()
endif()
View
218 main/glsl/forwardLighting_fp.glsl
@@ -54,6 +54,7 @@ uniform vec3 u_LightColor;
uniform float u_LightRadius;
uniform float u_LightScale;
uniform float u_LightWrapAround;
+uniform int u_AlphaTest;
uniform mat4 u_ShadowMatrix[MAX_SHADOWMAPS];
uniform vec4 u_ShadowParallelSplitDistances;
@@ -121,13 +122,13 @@ vec3 RandomVec3(vec2 uv)
#if 1
float r = Rand(uv);
float angle = 2.0 * M_PI * r;// / 360.0;
-
+
dir = normalize(vec3(cos(angle), sin(angle), r));
#else
// dir = texture2D(u_NoiseMap, gl_FragCoord.st * r_FBufScale).rgb;
dir = normalize(2.0 * (texture2D(u_RandomMap, uv).xyz - 0.5));
#endif
-
+
return dir;
}
@@ -160,13 +161,13 @@ float ChebyshevUpperBound(vec2 shadowMoments, float vertexDistance, float minVar
// compute probabilistic upper bound
float d = vertexDistance - shadowDistance;
float pMax = variance / (variance + (d * d));
-
+
/*
#if defined(r_LightBleedReduction)
pMax = smoothstep(r_LightBleedReduction, 1.0, pMax);
#endif
*/
-
+
// one-tailed Chebyshev with k > 0
return (vertexDistance <= shadowDistance ? 1.0 : pMax);
}
@@ -180,7 +181,7 @@ vec2 WarpDepth(float depth)
depth = 2.0 * depth - 1.0;
float pos = exp( r_EVSMExponents.x * depth);
float neg = -exp(-r_EVSMExponents.y * depth);
-
+
return vec2(pos, neg);
}
@@ -202,11 +203,11 @@ void FetchShadowMoments(vec3 Pworld, inout vec4 shadowVert, inout vec4 shadowMom
{
// vec4 shadowVert;
// vec4 shadowMoments;
-
+
// transform to camera space
vec4 Pcam = u_ViewMatrix * vec4(Pworld.xyz, 1.0);
float vertexDistanceToCamera = -Pcam.z;
-
+
#if defined(r_ParallelShadowSplits_1)
if(vertexDistanceToCamera < u_ShadowParallelSplitDistances.x)
{
@@ -228,7 +229,7 @@ void FetchShadowMoments(vec3 Pworld, inout vec4 shadowVert, inout vec4 shadowMom
{
shadowVert = u_ShadowMatrix[1] * vec4(Pworld.xyz, 1.0);
shadowMoments = texture2DProj(u_ShadowMap1, shadowVert.xyw);
-
+
}
else
{
@@ -300,14 +301,14 @@ void FetchShadowMoments(vec3 Pworld, inout vec4 shadowVert, inout vec4 shadowMom
vec4 PCF(vec3 Pworld, float filterWidth, float samples)
{
vec3 forward, right, up;
-
+
// filterWidth *= u_LightRadius;
-
+
forward = normalize(-u_LightDir);
MakeNormalVectors(forward, right, up);
-
+
vec4 moments = vec4(0.0, 0.0, 0.0, 0.0);
-
+
#if 0
// compute step size for iterating through the kernel
float stepSize = 2.0 * filterWidth / samples;
@@ -330,7 +331,7 @@ vec4 PCF(vec3 Pworld, float filterWidth, float samples)
vec3 rand = RandomVec3(gl_FragCoord.st * r_FBufScale + vec2(i, j)) * filterWidth;
// rand.z = 0;
// rand = normalize(rand) * filterWidth;
-
+
vec4 shadowVert;
vec4 shadowMoments;
FetchShadowMoments(Pworld + right * rand.x + up * rand.y, shadowVert, shadowMoments);
@@ -338,7 +339,7 @@ vec4 PCF(vec3 Pworld, float filterWidth, float samples)
}
}
#endif
-
+
// return average of the samples
moments *= (1.0 / (samples * samples));
return moments;
@@ -362,7 +363,7 @@ vec4 FetchShadowMoments(vec2 st)
vec4 PCF(vec4 shadowVert, float filterWidth, float samples)
{
vec4 moments = vec4(0.0, 0.0, 0.0, 0.0);
-
+
#if 0
// compute step size for iterating through the kernel
float stepSize = 2.0 * filterWidth / samples;
@@ -383,12 +384,12 @@ vec4 PCF(vec4 shadowVert, float filterWidth, float samples)
// rand = vec3(0.0, 0.0, 1.0);
// rand.z = 0;
// rand = normalize(rand);// * filterWidth;
-
+
moments += FetchShadowMoments(shadowVert.xy / shadowVert.w + rand.xy);
}
}
#endif
-
+
// return average of the samples
moments *= (1.0 / (samples * samples));
return moments;
@@ -410,12 +411,12 @@ vec4 FetchShadowMoments(vec3 I)
vec4 PCF(vec3 I, float filterWidth, float samples)
{
vec3 forward, right, up;
-
+
forward = normalize(I);
MakeNormalVectors(forward, right, up);
-
+
vec4 moments = vec4(0.0, 0.0, 0.0, 0.0);
-
+
#if 0
// compute step size for iterating through the kernel
float stepSize = 2.0 * filterWidth / samples;
@@ -435,12 +436,12 @@ vec4 PCF(vec3 I, float filterWidth, float samples)
vec3 rand = RandomVec3(gl_FragCoord.st * r_FBufScale + vec2(i, j)) * filterWidth;
// rand.z = 0;
// rand = normalize(rand) * filterWidth;
-
+
moments += FetchShadowMoments(I + right * rand.x + up * rand.y);
}
}
#endif
-
+
// return average of the samples
moments *= (1.0 / (samples * samples));
return moments;
@@ -460,19 +461,19 @@ vec4 PCF(vec3 I, float filterWidth, float samples)
float SumBlocker(vec4 shadowVert, float vertexDistance, float filterWidth, float samples)
{
float stepSize = 2.0 * filterWidth / samples;
-
+
float blockerCount = 0.0;
float blockerSum = 0.0;
-
+
for(float i = -filterWidth; i < filterWidth; i += stepSize)
{
for(float j = -filterWidth; j < filterWidth; j += stepSize)
{
float shadowDistance = texture2DProj(u_ShadowMap0, vec3(shadowVert.xy + vec2(i, j), shadowVert.w)).x;
// float shadowDistance = texture2D(u_ShadowMap, shadowVert.xy / shadowVert.w + vec2(i, j)).x;
-
+
// FIXME VSM_CLAMP
-
+
if(vertexDistance > shadowDistance)
{
blockerCount += 1.0;
@@ -480,13 +481,13 @@ float SumBlocker(vec4 shadowVert, float vertexDistance, float filterWidth, float
}
}
}
-
+
float result;
if(blockerCount > 0.0)
result = blockerSum / blockerCount;
else
result = 0.0;
-
+
return result;
}
#else
@@ -494,21 +495,21 @@ float SumBlocker(vec4 shadowVert, float vertexDistance, float filterWidth, float
float SumBlocker(vec3 I, float vertexDistance, float filterWidth, float samples)
{
vec3 forward, right, up;
-
+
forward = normalize(I);
MakeNormalVectors(forward, right, up);
float stepSize = 2.0 * filterWidth / samples;
-
+
float blockerCount = 0.0;
float blockerSum = 0.0;
-
+
for(float i = -filterWidth; i < filterWidth; i += stepSize)
{
for(float j = -filterWidth; j < filterWidth; j += stepSize)
{
float shadowDistance = textureCube(u_ShadowMap, I + right * i + up * j).x;
-
+
if(vertexDistance > shadowDistance)
{
blockerCount += 1.0;
@@ -516,13 +517,13 @@ float SumBlocker(vec3 I, float vertexDistance, float filterWidth, float samples)
}
}
}
-
+
float result;
if(blockerCount > 0.0)
result = blockerSum / blockerCount;
else
result = -1.0;
-
+
return result;
}
#endif
@@ -530,12 +531,12 @@ float SumBlocker(vec3 I, float vertexDistance, float filterWidth, float samples)
float EstimatePenumbra(float vertexDistance, float blocker)
{
float penumbra;
-
+
if(blocker == 0.0)
penumbra = 0.0;
else
penumbra = ((vertexDistance - blocker) * u_LightRadius) / blocker;
-
+
return penumbra;
}
@@ -606,7 +607,7 @@ void main()
}
#endif
-
+
#if 0
// create random noise vector
vec3 rand = RandomVec3(gl_FragCoord.st * r_FBufScale);
@@ -625,17 +626,17 @@ void main()
vec4 shadowVert;
vec4 shadowMoments;
FetchShadowMoments(var_Position.xyz, shadowVert, shadowMoments);
-
+
// FIXME
#if 0 // defined(r_PCFSamples)
shadowMoments = PCF(var_Position.xyz, u_ShadowTexelSize * u_ShadowBlur, r_PCFSamples);
#endif
-
-#if 0
+
+#if 0
gl_FragColor = vec4(u_ShadowTexelSize * u_ShadowBlur * u_LightRadius, 0.0, 0.0, 1.0);
return;
#endif
-
+
#if defined(r_ShowParallelShadowSplits)
// transform to camera space
vec4 Pcam = u_ViewMatrix * vec4(var_Position.xyz, 1.0);
@@ -726,52 +727,52 @@ void main()
#elif defined(LIGHT_PROJ)
vec4 shadowVert = u_ShadowMatrix[0] * vec4(var_Position.xyz, 1.0);
-
+
// compute incident ray
vec3 I = var_Position.xyz - u_LightOrigin;
-
+
const float SHADOW_BIAS = 0.001;
float vertexDistance = length(I) / u_LightRadius - SHADOW_BIAS;
-
+
#if defined(r_PCFSamples)
vec4 shadowMoments = PCF(shadowVert, u_ShadowTexelSize * u_ShadowBlur, r_PCFSamples);
-
+
/*
#elif defined(PCSS)
-
+
// step 1: find blocker estimate
-
+
float blockerSearchWidth = u_ShadowTexelSize * u_LightRadius / vertexDistance;
float blockerSamples = 6.0; // how many samples to use for blocker search
float blocker = SumBlocker(shadowVert, vertexDistance, blockerSearchWidth, blockerSamples);
-
+
#if 0
// uncomment to visualize blockers
gl_FragColor = vec4(blocker * 0.3, 0.0, 0.0, 1.0);
return;
#endif
-
+
// step 2: estimate penumbra using parallel planes approximation
float penumbra = EstimatePenumbra(vertexDistance, blocker);
-
+
#if 0
// uncomment to visualize penumbrae
gl_FragColor = vec4(0.0, 0.0, penumbra, 1.0);
return;
#endif
-
+
// step 3: compute percentage-closer filter
vec4 shadowMoments;
if(penumbra > 0.0)
{
const float PCFsamples = 4.0;
-
-
+
+
//float maxpen = PCFsamples * (1.0 / u_ShadowTexelSize);
//if(penumbra > maxpen)
// penumbra = maxpen;
//
-
+
shadowMoments = PCF(shadowVert, penumbra, PCFsamples);
}
else
@@ -787,11 +788,11 @@ void main()
#else
// compute incident ray
vec3 I = var_Position.xyz - u_LightOrigin;
-
+
// const float SHADOW_BIAS = 0.01;
// float vertexDistance = length(I) / u_LightRadius - 0.01;
-
-#if 0
+
+#if 0
gl_FragColor = vec4(u_ShadowTexelSize * u_ShadowBlur * length(I), 0.0, 0.0, 1.0);
return;
#endif
@@ -801,42 +802,42 @@ void main()
/*
#elif defined(PCSS)
-
+
// step 1: find blocker estimate
-
+
float blockerSearchWidth = u_ShadowTexelSize * u_LightRadius / vertexDistance;
float blockerSamples = 6.0; // how many samples to use for blocker search
float blocker = SumBlocker(I, vertexDistance, blockerSearchWidth, blockerSamples);
-
+
#if 0
// visualize blockers
gl_FragColor = vec4(blocker * 0.3, 0.0, 0.0, 1.0);
return;
#endif
-
+
// step 2: estimate penumbra using parallel planes approximation
float penumbra = EstimatePenumbra(vertexDistance, blocker);
-
+
#if 0
// visualize penumbrae
// if(penumbra > 1.0)
gl_FragColor = vec4(0.0, 0.0, penumbra, 1.0);
return;
#endif
-
+
// step 3: compute percentage-closer filter
// vec4 shadowMoments;
vec4 shadowMoments; // = textureCube(u_ShadowMap, I);
-
+
if(penumbra > 0.0 && blocker > -1.0)
{
const float PCFsamples = 2.0;
-
+
// float maxpen = PCFsamples * (1.0 / u_ShadowTexelSize);
// if(penumbra > maxpen)
// penumbra = maxpen;
//
-
+
// shadowMoments = PCF(I, penumbra, PCFsamples);
shadowMoments = PCF(I, u_ShadowTexelSize * u_ShadowBlur * penumbra, PCFsamples);
}
@@ -845,7 +846,7 @@ void main()
shadowMoments = textureCube(u_ShadowMap, I);
}
*/
-
+
#else
// no extra filtering, single tap
vec4 shadowMoments = FetchShadowMoments(I);
@@ -856,25 +857,25 @@ void main()
#if defined(ESM)
- {
+ {
const float SHADOW_BIAS = 0.001;
-
+
#if defined(LIGHT_DIRECTIONAL)
float vertexDistance = shadowVert.z - SHADOW_BIAS; // * r_ShadowMapDepthScale;
#else
float vertexDistance = (length(I) / u_LightRadius) - SHADOW_BIAS; // * r_ShadowMapDepthScale;
#endif
-
+
float shadowDistance = shadowMoments.a;
-
+
// standard shadow mapping
shadow = vertexDistance <= shadowDistance ? 1.0 : 0.0;
-
+
// exponential shadow mapping
// shadow = clamp(exp(r_OverDarkeningFactor * (shadowDistance - log(vertexDistance))), 0.0, 1.0);
// shadow = clamp(exp(r_OverDarkeningFactor * shadowDistance) * exp(-r_OverDarkeningFactor * vertexDistance), 0.0, 1.0);
// shadow = smoothstep(0.0, 1.0, shadow);
-
+
#if defined(r_DebugShadowMaps)
#extension GL_EXT_gpu_shader4 : enable
gl_FragColor.r = (r_DebugShadowMaps & 1) != 0 ? shadowDistance : 0.0;
@@ -890,7 +891,7 @@ void main()
// convert to [-1, 1] vector space
shadowMoments = 2.0 * (shadowMoments - 0.5);
#endif
-
+
const float SHADOW_BIAS = 0.001;
#if defined(LIGHT_DIRECTIONAL)
@@ -902,26 +903,26 @@ void main()
shadow = ChebyshevUpperBound(shadowMoments.ra, vertexDistance, VSM_EPSILON);
}
#elif defined(EVSM)
- {
+ {
const float SHADOW_BIAS = 0.001;
-
+
#if defined(LIGHT_DIRECTIONAL)
float vertexDistance = shadowVert.z - 0.0001;
#else
float vertexDistance = (length(I) / u_LightRadius) - SHADOW_BIAS; // * r_ShadowMapDepthScale;// - SHADOW_BIAS;
#endif
-
+
vec2 warpedVertexDistances = WarpDepth(vertexDistance);
// derivative of warping at depth
vec2 depthScale = VSM_EPSILON * r_EVSMExponents * warpedVertexDistances;
vec2 minVariance = depthScale * depthScale;
-
+
float posContrib = ChebyshevUpperBound(shadowMoments.xz, warpedVertexDistances.x, minVariance.x);
float negContrib = ChebyshevUpperBound(shadowMoments.yw, warpedVertexDistances.y, minVariance.y);
-
+
shadow = min(posContrib, negContrib);
-
+
#if defined(r_DebugShadowMaps)
#extension GL_EXT_gpu_shader4 : enable
gl_FragColor.r = (r_DebugShadowMaps & 1) != 0 ? posContrib : 0.0;
@@ -930,7 +931,7 @@ void main()
gl_FragColor.a = 1.0;
return;
#endif
-
+
}
#endif
@@ -941,7 +942,7 @@ void main()
}
#endif // USE_SHADOWING
-
+
// compute light direction in world space
#if defined(LIGHT_DIRECTIONAL)
vec3 L = u_LightDir;
@@ -950,7 +951,7 @@ void main()
#endif
vec2 texDiffuse = var_TexDiffuse.st;
-
+
#if defined(USE_NORMAL_MAPPING)
// invert tangent space for twosided surfaces
@@ -969,18 +970,18 @@ void main()
vec2 texNormal = var_TexNormal.st;
vec2 texSpecular = var_TexSpecular.st;
-
+
// compute view direction in world space
vec3 V = normalize(u_ViewOrigin - var_Position.xyz);
-
+
#if defined(USE_PARALLAX_MAPPING)
-
+
// ray intersect in view direction
-
+
mat3 worldToTangentMatrix;
#if defined(GLHW_ATI) || defined(GLHW_ATI_DX10) || defined(GLDRV_MESA)
worldToTangentMatrix = mat3(tangentToWorldMatrix[0][0], tangentToWorldMatrix[1][0], tangentToWorldMatrix[2][0],
- tangentToWorldMatrix[0][1], tangentToWorldMatrix[1][1], tangentToWorldMatrix[2][1],
+ tangentToWorldMatrix[0][1], tangentToWorldMatrix[1][1], tangentToWorldMatrix[2][1],
tangentToWorldMatrix[0][2], tangentToWorldMatrix[1][2], tangentToWorldMatrix[2][2]);
#else
worldToTangentMatrix = transpose(tangentToWorldMatrix);
@@ -989,15 +990,15 @@ void main()
// compute view direction in tangent space
vec3 Vts = worldToTangentMatrix * V;
Vts = normalize(Vts);
-
+
// size and start position of search in texture space
vec2 S = Vts.xy * -u_DepthScale / Vts.z;
-
+
float depth = RayIntersectDisplaceMap(texNormal, S, u_NormalMap);
-
+
// compute texcoords offset
vec2 texOffset = S * depth;
-
+
texDiffuse.st += texOffset;
texNormal.st += texOffset;
texSpecular.st += texOffset;
@@ -1016,7 +1017,7 @@ void main()
// transform normal into world space
N = normalize(tangentToWorldMatrix * N);
-
+
#else // USE_NORMAL_MAPPING
vec3 N;
@@ -1030,7 +1031,7 @@ void main()
{
N = normalize(var_Normal.xyz);
}
-
+
#endif // USE_NORMAL_MAPPING
// compute the light term
@@ -1042,6 +1043,23 @@ void main()
// compute the diffuse term
vec4 diffuse = texture2D(u_DiffuseMap, texDiffuse.st);
+#if defined(USE_ALPHA_TESTING)
+ if(u_AlphaTest == ATEST_GT_0 && diffuse.a <= 0.0)
+ {
+ discard;
+ return;
+ }
+ else if(u_AlphaTest == ATEST_LT_128 && diffuse.a >= 0.5)
+ {
+ discard;
+ return;
+ }
+ else if(u_AlphaTest == ATEST_GE_128 && diffuse.a < 0.5)
+ {
+ discard;
+ return;
+ }
+#endif
diffuse.rgb *= u_LightColor * NL;
#if defined(USE_NORMAL_MAPPING)
@@ -1055,19 +1073,19 @@ void main()
#if defined(LIGHT_PROJ)
vec3 attenuationXY = texture2DProj(u_AttenuationMapXY, var_TexAttenuation.xyw).rgb;
vec3 attenuationZ = texture2D(u_AttenuationMapZ, vec2(var_TexAttenuation.z + 0.5, 0.0)).rgb; // FIXME
-
+
#elif defined(LIGHT_DIRECTIONAL)
vec3 attenuationXY = vec3(1.0);
vec3 attenuationZ = vec3(1.0);
-
+
#else
vec3 attenuationXY = texture2D(u_AttenuationMapXY, var_TexAttenuation.xy).rgb;
vec3 attenuationZ = texture2D(u_AttenuationMapZ, vec2(var_TexAttenuation.z, 0)).rgb;
#endif
-
+
// compute final color
vec4 color = diffuse;
-
+
#if defined(USE_NORMAL_MAPPING)
color.rgb += specular;
#endif
@@ -1076,7 +1094,7 @@ void main()
color.rgb *= attenuationXY;
color.rgb *= attenuationZ;
#endif
-
+
color.rgb *= u_LightScale;
color.rgb *= shadow;
@@ -1084,7 +1102,7 @@ void main()
color.gb *= var_TexNormal.pq;
gl_FragColor = color;
-
+
#if 0
#if defined(USE_PARALLAX_MAPPING)
gl_FragColor = vec4(vec3(1.0, 0.0, 0.0), diffuse.a);
View
168 src/engine/OpenWolf.sln
@@ -43,12 +43,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Game Logic", "Game Logic",
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OWMaster", "..\tools\owmaster\owmaster.vcxproj", "{49F16AE1-8677-4ECE-A882-DC6BBC73C44E}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cgame", "..\gamelogic\etmain\src\cgame\cgame.vcxproj", "{68A804FC-00C3-44E2-A479-3DB3D20F943D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "game", "..\gamelogic\etmain\src\game\game.vcxproj", "{4F8332D7-5687-4875-813A-A1B7AA479C2D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ui", "..\gamelogic\etmain\src\ui\ui.vcxproj", "{4C02EEB1-33AA-41C5-9A96-609161DF1635}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenWolf", "OpenWolf.vcxproj", "{A09DE158-B7E5-4883-8EA3-26FB37F24CFA}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libogg", "..\libs\libogg\win32\VS2010\libogg_dynamic.vcxproj", "{15CBFEFF-7965-41F5-B4E2-21E8795C9159}"
@@ -77,6 +71,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "game", "..\gamelogic\base\s
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ui", "..\gamelogic\base\src\ui\ui.vcxproj", "{75976B8A-6A6C-4CB9-B953-8633BD61181B}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cgame", "..\gamelogic\etmain\src\cgame\cgame.vcxproj", "{68A804FC-00C3-44E2-A479-3DB3D20F943D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "game", "..\gamelogic\etmain\src\game\game.vcxproj", "{4F8332D7-5687-4875-813A-A1B7AA479C2D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ui", "..\gamelogic\etmain\src\ui\ui.vcxproj", "{4C02EEB1-33AA-41C5-9A96-609161DF1635}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug AutoUpdate|Win32 = Debug AutoUpdate|Win32
@@ -314,78 +314,6 @@ Global
{49F16AE1-8677-4ECE-A882-DC6BBC73C44E}.Release|Win32.Build.0 = Release|Win32
{49F16AE1-8677-4ECE-A882-DC6BBC73C44E}.Release|x64.ActiveCfg = Release|x64
{49F16AE1-8677-4ECE-A882-DC6BBC73C44E}.Release|x64.Build.0 = Release|x64
- {68A804FC-00C3-44E2-A479-3DB3D20F943D}.Debug AutoUpdate|Win32.ActiveCfg = Debug AutoUpdate|Win32
- {68A804FC-00C3-44E2-A479-3DB3D20F943D}.Debug AutoUpdate|x64.ActiveCfg = Debug AutoUpdate|x64
- {68A804FC-00C3-44E2-A479-3DB3D20F943D}.Debug Dedicated|Win32.ActiveCfg = Debug|Win32
- {68A804FC-00C3-44E2-A479-3DB3D20F943D}.Debug Dedicated|x64.ActiveCfg = Debug|x64
- {68A804FC-00C3-44E2-A479-3DB3D20F943D}.Debug|Win32.ActiveCfg = Debug|Win32
- {68A804FC-00C3-44E2-A479-3DB3D20F943D}.Debug|Win32.Build.0 = Debug|Win32
- {68A804FC-00C3-44E2-A479-3DB3D20F943D}.Debug|x64.ActiveCfg = Debug|x64
- {68A804FC-00C3-44E2-A479-3DB3D20F943D}.Debug|x64.Build.0 = Debug|x64
- {68A804FC-00C3-44E2-A479-3DB3D20F943D}.DLL Debug|Win32.ActiveCfg = Debug|Win32
- {68A804FC-00C3-44E2-A479-3DB3D20F943D}.DLL Debug|Win32.Build.0 = Debug|Win32
- {68A804FC-00C3-44E2-A479-3DB3D20F943D}.DLL Debug|x64.ActiveCfg = Debug|x64
- {68A804FC-00C3-44E2-A479-3DB3D20F943D}.DLL Debug|x64.Build.0 = Debug|x64
- {68A804FC-00C3-44E2-A479-3DB3D20F943D}.DLL Release|Win32.ActiveCfg = Release|Win32
- {68A804FC-00C3-44E2-A479-3DB3D20F943D}.DLL Release|Win32.Build.0 = Release|Win32
- {68A804FC-00C3-44E2-A479-3DB3D20F943D}.DLL Release|x64.ActiveCfg = Release|x64
- {68A804FC-00C3-44E2-A479-3DB3D20F943D}.DLL Release|x64.Build.0 = Release|x64
- {68A804FC-00C3-44E2-A479-3DB3D20F943D}.Release AutoUpdate|Win32.ActiveCfg = Release AutoUpdate|Win32
- {68A804FC-00C3-44E2-A479-3DB3D20F943D}.Release AutoUpdate|x64.ActiveCfg = Release AutoUpdate|x64
- {68A804FC-00C3-44E2-A479-3DB3D20F943D}.Release Dedicated|Win32.ActiveCfg = Release|Win32
- {68A804FC-00C3-44E2-A479-3DB3D20F943D}.Release Dedicated|x64.ActiveCfg = Release|x64
- {68A804FC-00C3-44E2-A479-3DB3D20F943D}.Release|Win32.ActiveCfg = Release|Win32
- {68A804FC-00C3-44E2-A479-3DB3D20F943D}.Release|Win32.Build.0 = Release|Win32
- {68A804FC-00C3-44E2-A479-3DB3D20F943D}.Release|x64.ActiveCfg = Release|x64
- {68A804FC-00C3-44E2-A479-3DB3D20F943D}.Release|x64.Build.0 = Release|x64
- {4F8332D7-5687-4875-813A-A1B7AA479C2D}.Debug AutoUpdate|Win32.ActiveCfg = Debug AutoUpdate|Win32
- {4F8332D7-5687-4875-813A-A1B7AA479C2D}.Debug AutoUpdate|x64.ActiveCfg = Debug AutoUpdate|x64
- {4F8332D7-5687-4875-813A-A1B7AA479C2D}.Debug Dedicated|Win32.ActiveCfg = Debug|Win32
- {4F8332D7-5687-4875-813A-A1B7AA479C2D}.Debug Dedicated|x64.ActiveCfg = Debug|x64
- {4F8332D7-5687-4875-813A-A1B7AA479C2D}.Debug|Win32.ActiveCfg = Debug|Win32
- {4F8332D7-5687-4875-813A-A1B7AA479C2D}.Debug|Win32.Build.0 = Debug|Win32
- {4F8332D7-5687-4875-813A-A1B7AA479C2D}.Debug|x64.ActiveCfg = Debug|x64
- {4F8332D7-5687-4875-813A-A1B7AA479C2D}.Debug|x64.Build.0 = Debug|x64
- {4F8332D7-5687-4875-813A-A1B7AA479C2D}.DLL Debug|Win32.ActiveCfg = Debug|Win32
- {4F8332D7-5687-4875-813A-A1B7AA479C2D}.DLL Debug|Win32.Build.0 = Debug|Win32
- {4F8332D7-5687-4875-813A-A1B7AA479C2D}.DLL Debug|x64.ActiveCfg = Debug|x64
- {4F8332D7-5687-4875-813A-A1B7AA479C2D}.DLL Debug|x64.Build.0 = Debug|x64
- {4F8332D7-5687-4875-813A-A1B7AA479C2D}.DLL Release|Win32.ActiveCfg = Release|Win32
- {4F8332D7-5687-4875-813A-A1B7AA479C2D}.DLL Release|Win32.Build.0 = Release|Win32
- {4F8332D7-5687-4875-813A-A1B7AA479C2D}.DLL Release|x64.ActiveCfg = Release|x64
- {4F8332D7-5687-4875-813A-A1B7AA479C2D}.DLL Release|x64.Build.0 = Release|x64
- {4F8332D7-5687-4875-813A-A1B7AA479C2D}.Release AutoUpdate|Win32.ActiveCfg = Release AutoUpdate|Win32
- {4F8332D7-5687-4875-813A-A1B7AA479C2D}.Release AutoUpdate|x64.ActiveCfg = Release AutoUpdate|x64
- {4F8332D7-5687-4875-813A-A1B7AA479C2D}.Release Dedicated|Win32.ActiveCfg = Release|Win32
- {4F8332D7-5687-4875-813A-A1B7AA479C2D}.Release Dedicated|x64.ActiveCfg = Release|x64
- {4F8332D7-5687-4875-813A-A1B7AA479C2D}.Release|Win32.ActiveCfg = Release|Win32
- {4F8332D7-5687-4875-813A-A1B7AA479C2D}.Release|Win32.Build.0 = Release|Win32
- {4F8332D7-5687-4875-813A-A1B7AA479C2D}.Release|x64.ActiveCfg = Release|x64
- {4F8332D7-5687-4875-813A-A1B7AA479C2D}.Release|x64.Build.0 = Release|x64
- {4C02EEB1-33AA-41C5-9A96-609161DF1635}.Debug AutoUpdate|Win32.ActiveCfg = Debug AutoUpdate|Win32
- {4C02EEB1-33AA-41C5-9A96-609161DF1635}.Debug AutoUpdate|x64.ActiveCfg = Debug AutoUpdate|x64
- {4C02EEB1-33AA-41C5-9A96-609161DF1635}.Debug Dedicated|Win32.ActiveCfg = Debug|Win32
- {4C02EEB1-33AA-41C5-9A96-609161DF1635}.Debug Dedicated|x64.ActiveCfg = Debug|x64
- {4C02EEB1-33AA-41C5-9A96-609161DF1635}.Debug|Win32.ActiveCfg = Debug|Win32
- {4C02EEB1-33AA-41C5-9A96-609161DF1635}.Debug|Win32.Build.0 = Debug|Win32
- {4C02EEB1-33AA-41C5-9A96-609161DF1635}.Debug|x64.ActiveCfg = Debug|x64
- {4C02EEB1-33AA-41C5-9A96-609161DF1635}.Debug|x64.Build.0 = Debug|x64
- {4C02EEB1-33AA-41C5-9A96-609161DF1635}.DLL Debug|Win32.ActiveCfg = Debug|Win32
- {4C02EEB1-33AA-41C5-9A96-609161DF1635}.DLL Debug|Win32.Build.0 = Debug|Win32
- {4C02EEB1-33AA-41C5-9A96-609161DF1635}.DLL Debug|x64.ActiveCfg = Debug|x64
- {4C02EEB1-33AA-41C5-9A96-609161DF1635}.DLL Debug|x64.Build.0 = Debug|x64
- {4C02EEB1-33AA-41C5-9A96-609161DF1635}.DLL Release|Win32.ActiveCfg = Release|Win32
- {4C02EEB1-33AA-41C5-9A96-609161DF1635}.DLL Release|Win32.Build.0 = Release|Win32
- {4C02EEB1-33AA-41C5-9A96-609161DF1635}.DLL Release|x64.ActiveCfg = Release|x64
- {4C02EEB1-33AA-41C5-9A96-609161DF1635}.DLL Release|x64.Build.0 = Release|x64
- {4C02EEB1-33AA-41C5-9A96-609161DF1635}.Release AutoUpdate|Win32.ActiveCfg = Release AutoUpdate|Win32
- {4C02EEB1-33AA-41C5-9A96-609161DF1635}.Release AutoUpdate|x64.ActiveCfg = Release AutoUpdate|x64
- {4C02EEB1-33AA-41C5-9A96-609161DF1635}.Release Dedicated|Win32.ActiveCfg = Release|Win32
- {4C02EEB1-33AA-41C5-9A96-609161DF1635}.Release Dedicated|x64.ActiveCfg = Release|x64
- {4C02EEB1-33AA-41C5-9A96-609161DF1635}.Release|Win32.ActiveCfg = Release|Win32
- {4C02EEB1-33AA-41C5-9A96-609161DF1635}.Release|Win32.Build.0 = Release|Win32
- {4C02EEB1-33AA-41C5-9A96-609161DF1635}.Release|x64.ActiveCfg = Release|x64
- {4C02EEB1-33AA-41C5-9A96-609161DF1635}.Release|x64.Build.0 = Release|x64
{A09DE158-B7E5-4883-8EA3-26FB37F24CFA}.Debug AutoUpdate|Win32.ActiveCfg = Debug AutoUpdate|Win32
{A09DE158-B7E5-4883-8EA3-26FB37F24CFA}.Debug AutoUpdate|Win32.Build.0 = Debug AutoUpdate|Win32
{A09DE158-B7E5-4883-8EA3-26FB37F24CFA}.Debug AutoUpdate|x64.ActiveCfg = Debug AutoUpdate|x64
@@ -745,6 +673,90 @@ Global
{75976B8A-6A6C-4CB9-B953-8633BD61181B}.Release|Win32.Build.0 = Release|Win32
{75976B8A-6A6C-4CB9-B953-8633BD61181B}.Release|x64.ActiveCfg = Release|x64
{75976B8A-6A6C-4CB9-B953-8633BD61181B}.Release|x64.Build.0 = Release|x64
+ {68A804FC-00C3-44E2-A479-3DB3D20F943D}.Debug AutoUpdate|Win32.ActiveCfg = Debug|x64
+ {68A804FC-00C3-44E2-A479-3DB3D20F943D}.Debug AutoUpdate|x64.ActiveCfg = Debug|x64
+ {68A804FC-00C3-44E2-A479-3DB3D20F943D}.Debug AutoUpdate|x64.Build.0 = Debug|x64
+ {68A804FC-00C3-44E2-A479-3DB3D20F943D}.Debug Dedicated|Win32.ActiveCfg = Debug|x64
+ {68A804FC-00C3-44E2-A479-3DB3D20F943D}.Debug Dedicated|x64.ActiveCfg = Debug|x64
+ {68A804FC-00C3-44E2-A479-3DB3D20F943D}.Debug Dedicated|x64.Build.0 = Debug|x64
+ {68A804FC-00C3-44E2-A479-3DB3D20F943D}.Debug|Win32.ActiveCfg = Debug|Win32
+ {68A804FC-00C3-44E2-A479-3DB3D20F943D}.Debug|Win32.Build.0 = Debug|Win32
+ {68A804FC-00C3-44E2-A479-3DB3D20F943D}.Debug|x64.ActiveCfg = Debug|x64
+ {68A804FC-00C3-44E2-A479-3DB3D20F943D}.Debug|x64.Build.0 = Debug|x64
+ {68A804FC-00C3-44E2-A479-3DB3D20F943D}.DLL Debug|Win32.ActiveCfg = Debug|Win32
+ {68A804FC-00C3-44E2-A479-3DB3D20F943D}.DLL Debug|Win32.Build.0 = Debug|Win32
+ {68A804FC-00C3-44E2-A479-3DB3D20F943D}.DLL Debug|x64.ActiveCfg = Debug|x64
+ {68A804FC-00C3-44E2-A479-3DB3D20F943D}.DLL Debug|x64.Build.0 = Debug|x64
+ {68A804FC-00C3-44E2-A479-3DB3D20F943D}.DLL Release|Win32.ActiveCfg = Release|Win32
+ {68A804FC-00C3-44E2-A479-3DB3D20F943D}.DLL Release|Win32.Build.0 = Release|Win32
+ {68A804FC-00C3-44E2-A479-3DB3D20F943D}.DLL Release|x64.ActiveCfg = Release|x64
+ {68A804FC-00C3-44E2-A479-3DB3D20F943D}.DLL Release|x64.Build.0 = Release|x64
+ {68A804FC-00C3-44E2-A479-3DB3D20F943D}.Release AutoUpdate|Win32.ActiveCfg = Release|x64
+ {68A804FC-00C3-44E2-A479-3DB3D20F943D}.Release AutoUpdate|x64.ActiveCfg = Release|x64
+ {68A804FC-00C3-44E2-A479-3DB3D20F943D}.Release AutoUpdate|x64.Build.0 = Release|x64
+ {68A804FC-00C3-44E2-A479-3DB3D20F943D}.Release Dedicated|Win32.ActiveCfg = Release|x64
+ {68A804FC-00C3-44E2-A479-3DB3D20F943D}.Release Dedicated|x64.ActiveCfg = Release|x64
+ {68A804FC-00C3-44E2-A479-3DB3D20F943D}.Release Dedicated|x64.Build.0 = Release|x64
+ {68A804FC-00C3-44E2-A479-3DB3D20F943D}.Release|Win32.ActiveCfg = Release|Win32
+ {68A804FC-00C3-44E2-A479-3DB3D20F943D}.Release|Win32.Build.0 = Release|Win32
+ {68A804FC-00C3-44E2-A479-3DB3D20F943D}.Release|x64.ActiveCfg = Release|x64
+ {68A804FC-00C3-44E2-A479-3DB3D20F943D}.Release|x64.Build.0 = Release|x64
+ {4F8332D7-5687-4875-813A-A1B7AA479C2D}.Debug AutoUpdate|Win32.ActiveCfg = Debug|x64
+ {4F8332D7-5687-4875-813A-A1B7AA479C2D}.Debug AutoUpdate|x64.ActiveCfg = Debug|x64
+ {4F8332D7-5687-4875-813A-A1B7AA479C2D}.Debug AutoUpdate|x64.Build.0 = Debug|x64
+ {4F8332D7-5687-4875-813A-A1B7AA479C2D}.Debug Dedicated|Win32.ActiveCfg = Debug|x64
+ {4F8332D7-5687-4875-813A-A1B7AA479C2D}.Debug Dedicated|x64.ActiveCfg = Debug|x64
+ {4F8332D7-5687-4875-813A-A1B7AA479C2D}.Debug Dedicated|x64.Build.0 = Debug|x64
+ {4F8332D7-5687-4875-813A-A1B7AA479C2D}.Debug|Win32.ActiveCfg = Debug|Win32
+ {4F8332D7-5687-4875-813A-A1B7AA479C2D}.Debug|Win32.Build.0 = Debug|Win32
+ {4F8332D7-5687-4875-813A-A1B7AA479C2D}.Debug|x64.ActiveCfg = Debug|x64
+ {4F8332D7-5687-4875-813A-A1B7AA479C2D}.Debug|x64.Build.0 = Debug|x64
+ {4F8332D7-5687-4875-813A-A1B7AA479C2D}.DLL Debug|Win32.ActiveCfg = Debug|Win32
+ {4F8332D7-5687-4875-813A-A1B7AA479C2D}.DLL Debug|Win32.Build.0 = Debug|Win32
+ {4F8332D7-5687-4875-813A-A1B7AA479C2D}.DLL Debug|x64.ActiveCfg = Debug|x64
+ {4F8332D7-5687-4875-813A-A1B7AA479C2D}.DLL Debug|x64.Build.0 = Debug|x64
+ {4F8332D7-5687-4875-813A-A1B7AA479C2D}.DLL Release|Win32.ActiveCfg = Release|Win32
+ {4F8332D7-5687-4875-813A-A1B7AA479C2D}.DLL Release|Win32.Build.0 = Release|Win32
+ {4F8332D7-5687-4875-813A-A1B7AA479C2D}.DLL Release|x64.ActiveCfg = Release|x64
+ {4F8332D7-5687-4875-813A-A1B7AA479C2D}.DLL Release|x64.Build.0 = Release|x64
+ {4F8332D7-5687-4875-813A-A1B7AA479C2D}.Release AutoUpdate|Win32.ActiveCfg = Release|x64
+ {4F8332D7-5687-4875-813A-A1B7AA479C2D}.Release AutoUpdate|x64.ActiveCfg = Release|x64
+ {4F8332D7-5687-4875-813A-A1B7AA479C2D}.Release AutoUpdate|x64.Build.0 = Release|x64
+ {4F8332D7-5687-4875-813A-A1B7AA479C2D}.Release Dedicated|Win32.ActiveCfg = Release|x64
+ {4F8332D7-5687-4875-813A-A1B7AA479C2D}.Release Dedicated|x64.ActiveCfg = Release|x64
+ {4F8332D7-5687-4875-813A-A1B7AA479C2D}.Release Dedicated|x64.Build.0 = Release|x64
+ {4F8332D7-5687-4875-813A-A1B7AA479C2D}.Release|Win32.ActiveCfg = Release|Win32
+ {4F8332D7-5687-4875-813A-A1B7AA479C2D}.Release|Win32.Build.0 = Release|Win32
+ {4F8332D7-5687-4875-813A-A1B7AA479C2D}.Release|x64.ActiveCfg = Release|x64
+ {4F8332D7-5687-4875-813A-A1B7AA479C2D}.Release|x64.Build.0 = Release|x64
+ {4C02EEB1-33AA-41C5-9A96-609161DF1635}.Debug AutoUpdate|Win32.ActiveCfg = Debug|x64
+ {4C02EEB1-33AA-41C5-9A96-609161DF1635}.Debug AutoUpdate|x64.ActiveCfg = Debug|x64
+ {4C02EEB1-33AA-41C5-9A96-609161DF1635}.Debug AutoUpdate|x64.Build.0 = Debug|x64
+ {4C02EEB1-33AA-41C5-9A96-609161DF1635}.Debug Dedicated|Win32.ActiveCfg = Debug|x64
+ {4C02EEB1-33AA-41C5-9A96-609161DF1635}.Debug Dedicated|x64.ActiveCfg = Debug|x64
+ {4C02EEB1-33AA-41C5-9A96-609161DF1635}.Debug Dedicated|x64.Build.0 = Debug|x64
+ {4C02EEB1-33AA-41C5-9A96-609161DF1635}.Debug|Win32.ActiveCfg = Debug|Win32
+ {4C02EEB1-33AA-41C5-9A96-609161DF1635}.Debug|Win32.Build.0 = Debug|Win32
+ {4C02EEB1-33AA-41C5-9A96-609161DF1635}.Debug|x64.ActiveCfg = Debug|x64
+ {4C02EEB1-33AA-41C5-9A96-609161DF1635}.Debug|x64.Build.0 = Debug|x64
+ {4C02EEB1-33AA-41C5-9A96-609161DF1635}.DLL Debug|Win32.ActiveCfg = Debug|Win32
+ {4C02EEB1-33AA-41C5-9A96-609161DF1635}.DLL Debug|Win32.Build.0 = Debug|Win32
+ {4C02EEB1-33AA-41C5-9A96-609161DF1635}.DLL Debug|x64.ActiveCfg = Debug|x64
+ {4C02EEB1-33AA-41C5-9A96-609161DF1635}.DLL Debug|x64.Build.0 = Debug|x64
+ {4C02EEB1-33AA-41C5-9A96-609161DF1635}.DLL Release|Win32.ActiveCfg = Release|Win32
+ {4C02EEB1-33AA-41C5-9A96-609161DF1635}.DLL Release|Win32.Build.0 = Release|Win32
+ {4C02EEB1-33AA-41C5-9A96-609161DF1635}.DLL Release|x64.ActiveCfg = Release|x64
+ {4C02EEB1-33AA-41C5-9A96-609161DF1635}.DLL Release|x64.Build.0 = Release|x64
+ {4C02EEB1-33AA-41C5-9A96-609161DF1635}.Release AutoUpdate|Win32.ActiveCfg = Release|x64
+ {4C02EEB1-33AA-41C5-9A96-609161DF1635}.Release AutoUpdate|x64.ActiveCfg = Release|x64
+ {4C02EEB1-33AA-41C5-9A96-609161DF1635}.Release AutoUpdate|x64.Build.0 = Release|x64
+ {4C02EEB1-33AA-41C5-9A96-609161DF1635}.Release Dedicated|Win32.ActiveCfg = Release|x64
+ {4C02EEB1-33AA-41C5-9A96-609161DF1635}.Release Dedicated|x64.ActiveCfg = Release|x64
+ {4C02EEB1-33AA-41C5-9A96-609161DF1635}.Release Dedicated|x64.Build.0 = Release|x64
+ {4C02EEB1-33AA-41C5-9A96-609161DF1635}.Release|Win32.ActiveCfg = Release|Win32
+ {4C02EEB1-33AA-41C5-9A96-609161DF1635}.Release|Win32.Build.0 = Release|Win32
+ {4C02EEB1-33AA-41C5-9A96-609161DF1635}.Release|x64.ActiveCfg = Release|x64
+ {4C02EEB1-33AA-41C5-9A96-609161DF1635}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
View
4 src/engine/OpenWolf.vcxproj
@@ -1198,11 +1198,11 @@ echo hostname &gt; status-info/build-machine
<ClCompile Include="cm\CollisionModel_translate.cpp" />
<ClCompile Include="database\db_main.cpp" />
<ClCompile Include="database\db_mysql.cpp" />
- <ClCompile Include="framework\ioapi.cpp" />
+ <ClCompile Include="framework\ioapi.c" />
<ClCompile Include="FrameWork\KeyInput.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Dedicated|x64'">true</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="framework\Unzip.cpp" />
+ <ClCompile Include="framework\Unzip.c" />
<ClCompile Include="qcommon\cm_api.cpp" />
<ClCompile Include="qcommon\cm_load.cpp" />
<ClCompile Include="qcommon\cm_patch.cpp" />
View
8 src/engine/OpenWolf.vcxproj.filters
@@ -524,13 +524,13 @@
<ClCompile Include="qcommon\files.cpp">
<Filter>Source Files\Qcommon</Filter>
</ClCompile>
- <ClCompile Include="framework\Unzip.cpp">
- <Filter>Source Files\FrameWork</Filter>
- </ClCompile>
<ClCompile Include="qcommon\huffman.cpp">
<Filter>Source Files\Qcommon</Filter>
</ClCompile>
- <ClCompile Include="framework\ioapi.cpp">
+ <ClCompile Include="framework\ioapi.c">
+ <Filter>Source Files\FrameWork</Filter>
+ </ClCompile>
+ <ClCompile Include="framework\Unzip.c">
<Filter>Source Files\FrameWork</Filter>
</ClCompile>
</ItemGroup>
View
2  src/engine/botlib/l_struct.cpp
@@ -41,14 +41,12 @@ Maryland 20850 USA.
*
*****************************************************************************/
-#ifdef BOTLIB
#include "../idLib/precompiled.h"
#include "../qcommon/q_shared.h"
#include "botlib.h" //for the include of be_interface.h
#include "l_struct.h"
#include "l_utils.h"
#include "be_interface.h"
-#endif //BOTLIB
#ifdef BSPC
//include files for usage in the BSP Converter
View
5 src/engine/client/cl_cgame.cpp
@@ -835,6 +835,7 @@ intptr_t CL_CgameSystemCalls(intptr_t * args) {
//return S_StartStreamingSound(VMA(1), VMA(2), args[3], args[4], args[5]);
return 0;
case CG_R_LOADWORLDMAP:
+ re.SetWorldVisData( CM_ClusterPVS( -1 ) );
re.LoadWorld((char*)VMA(1));
return 0;
case CG_R_REGISTERMODEL:
@@ -1703,12 +1704,12 @@ void CL_SetCGameTime(void)
CL_GetTag
====================
*/
-qboolean CL_GetTag(int clientNum, char *tagname, orientation_t * or)
+qboolean CL_GetTag(int clientNum, char *tagname, orientation_t * _or)
{
if(!cgvm)
{
return qfalse;
}
- return (qboolean)VM_Call(cgvm, CG_GET_TAG, clientNum, tagname, or);
+ return (qboolean)VM_Call(cgvm, CG_GET_TAG, clientNum, tagname, _or);
}
View
4 src/engine/client/cl_irc.cpp
@@ -338,7 +338,7 @@ static ID_INLINE void IRC_AddHandler( const char * command , irc_handler_func_t
struct irc_handler_t* rv;
rv = (irc_handler_t*)HT_GetItem( IRC_Handlers , command , &created );
assert( created );
- rv->handler = handler;
+ rv->handler =(irc_handler_func_t*)handler;
}
/*
@@ -353,7 +353,7 @@ static void IRC_AddCTCPHandler( const char * command , ctcp_handler_func_t handl
struct irc_handler_t * rv;
rv = (irc_handler_t*)HT_GetItem( IRC_CTCPHandlers , command , &created );
assert( created );
- rv->handler = handler;
+ rv->handler = (ctcp_handler_func_t*)handler;
}
/*
View
2  src/engine/client/cl_main.cpp
@@ -690,7 +690,7 @@ CL_GetReliableCommand
char * CL_GetReliableCommand( int index )
{
char * cmd = clc.reliableCommands[ index & (MAX_RELIABLE_COMMANDS-1) ];
- return cmd?cmd:"";
+ return (char*)(cmd?cmd:"");
}
/*
View
2  src/engine/client/cl_parse.cpp
@@ -1115,7 +1115,7 @@ CL_GetReliableServerCommand
char * CL_GetReliableServerCommand( int index )
{
char * cmd = clc.serverCommands[ index & (MAX_RELIABLE_COMMANDS-1) ];
- return cmd?cmd:"";
+ return (char*)(cmd?cmd:"");
}
/*
View
2,127 src/engine/framework/Unzip.cpp
@@ -1,2127 +0,0 @@
-/* unzip.c -- IO for uncompress .zip files using zlib
- Version 1.1, February 14h, 2010
- part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
- Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
-
- Modifications of Unzip for Zip64
- Copyright (C) 2007-2008 Even Rouault
-
- Modifications for Zip64 support on both zip and unzip
- Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-
- For more info read MiniZip_info.txt
-
-
- ------------------------------------------------------------------------------------
- Decryption code comes from crypt.c by Info-ZIP but has been greatly reduced in terms of
- compatibility with older software. The following is from the original crypt.c.
- Code woven in by Terry Thorsen 1/2003.
-
- Copyright (c) 1990-2000 Info-ZIP. All rights reserved.
-
- See the accompanying file LICENSE, version 2000-Apr-09 or later
- (the contents of which are also included in zip.h) for terms of use.
- If, for some reason, all these files are missing, the Info-ZIP license
- also may be found at: ftp://ftp.info-zip.org/pub/infozip/license.html
-
- crypt.c (full version) by Info-ZIP. Last revised: [see crypt.h]
-
- The encryption/decryption parts of this source code (as opposed to the
- non-echoing password parts) were originally written in Europe. The
- whole source package can be freely distributed, including from the USA.
- (Prior to January 2000, re-export from the US was a violation of US law.)
-
- This encryption code is a direct transcription of the algorithm from
- Roger Schlafly, described by Phil Katz in the file appnote.txt. This
- file (appnote.txt) is distributed with the PKZIP program (even in the
- version without encryption capabilities).
-
- ------------------------------------------------------------------------------------
-
- Changes in unzip.c
-
- 2007-2008 - Even Rouault - Addition of cpl_unzGetCurrentFileZStreamPos
- 2007-2008 - Even Rouault - Decoration of symbol names unz* -> cpl_unz*
- 2007-2008 - Even Rouault - Remove old C style function prototypes
- 2007-2008 - Even Rouault - Add unzip support for ZIP64
-
- Copyright (C) 2007-2008 Even Rouault
-
-
- Oct-2009 - Mathias Svensson - Removed cpl_* from symbol names (Even Rouault added them but since this is now moved to a new project (minizip64) I renamed them again).
- Oct-2009 - Mathias Svensson - Fixed problem if uncompressed size was > 4G and compressed size was <4G
- should only read the compressed/uncompressed size from the Zip64 format if
- the size from normal header was 0xFFFFFFFF
- Oct-2009 - Mathias Svensson - Applied some bug fixes from paches recived from Gilles Vollant
- Oct-2009 - Mathias Svensson - Applied support to unzip files with compression mathod BZIP2 (bzip2 lib is required)
- Patch created by Daniel Borca
-
- Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer
-
- Copyright (C) 1998 - 2010 Gilles Vollant, Even Rouault, Mathias Svensson
-
-*/
-
-#include "../idLib/precompiled.h"
-#include "../client/client.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifndef NOUNCRYPT
- #define NOUNCRYPT
-#endif
-
-#include <zlib.h>
-#include "unzip.h"
-
-#ifdef STDC
-# include <stddef.h>
-# include <string.h>
-# include <stdlib.h>
-#endif
-#ifdef NO_ERRNO_H
- extern int errno;
-#else
-# include <errno.h>
-#endif
-
-
-#ifndef local
-# define local static
-#endif
-/* compile with -Dlocal if your debugger can't find static symbols */
-
-
-#ifndef CASESENSITIVITYDEFAULT_NO
-# if !defined(unix) && !defined(CASESENSITIVITYDEFAULT_YES)
-# define CASESENSITIVITYDEFAULT_NO
-# endif
-#endif
-
-
-#ifndef UNZ_BUFSIZE
-#define UNZ_BUFSIZE (16384)
-#endif
-
-#ifndef UNZ_MAXFILENAMEINZIP
-#define UNZ_MAXFILENAMEINZIP (256)
-#endif
-
-#ifndef ALLOC
-# define ALLOC(size) (malloc(size))
-#endif
-#ifndef TRYFREE
-# define TRYFREE(p) {if (p) free(p);}
-#endif
-
-#define SIZECENTRALDIRITEM (0x2e)
-#define SIZEZIPLOCALHEADER (0x1e)
-
-
-const char unz_copyright[] =
- " unzip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
-
-/* unz_file_info_interntal contain internal info about a file in zipfile*/
-typedef struct unz_file_info64_internal_s
-{
- ZPOS64_T offset_curfile;/* relative offset of local header 8 bytes */
-} unz_file_info64_internal;
-
-
-/* file_in_zip_read_info_s contain internal information about a file in zipfile,
- when reading and decompress it */
-typedef struct
-{
- char *read_buffer; /* internal buffer for compressed data */
- z_stream stream; /* zLib stream structure for inflate */
-
-#ifdef HAVE_BZIP2
- bz_stream bstream; /* bzLib stream structure for bziped */
-#endif
-
- ZPOS64_T pos_in_zipfile; /* position in byte on the zipfile, for fseek*/
- uLong stream_initialised; /* flag set if stream structure is initialised*/
-
- ZPOS64_T offset_local_extrafield;/* offset of the local extra field */
- uInt size_local_extrafield;/* size of the local extra field */
- ZPOS64_T pos_local_extrafield; /* position in the local extra field in read*/
- ZPOS64_T total_out_64;
-
- uLong crc32; /* crc32 of all data uncompressed */
- uLong crc32_wait; /* crc32 we must obtain after decompress all */
- ZPOS64_T rest_read_compressed; /* number of byte to be decompressed */
- ZPOS64_T rest_read_uncompressed;/*number of byte to be obtained after decomp*/
- zlib_filefunc64_32_def z_filefunc;
- voidpf filestream; /* io structore of the zipfile */
- uLong compression_method; /* compression method (0==store) */
- ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
- int raw;
-} file_in_zip64_read_info_s;
-
-
-/* unz64_s contain internal information about the zipfile
-*/
-typedef struct
-{
- zlib_filefunc64_32_def z_filefunc;
- int is64bitOpenFunction;
- voidpf filestream; /* io structore of the zipfile */
- unz_global_info64 gi; /* public global information */
- ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
- ZPOS64_T num_file; /* number of the current file in the zipfile*/
- ZPOS64_T pos_in_central_dir; /* pos of the current file in the central dir*/
- ZPOS64_T current_file_ok; /* flag about the usability of the current file*/
- ZPOS64_T central_pos; /* position of the beginning of the central dir*/
-
- ZPOS64_T size_central_dir; /* size of the central directory */
- ZPOS64_T offset_central_dir; /* offset of start of central directory with
- respect to the starting disk number */
-
- unz_file_info64 cur_file_info; /* public info about the current file in zip*/
- unz_file_info64_internal cur_file_info_internal; /* private info about it*/
- file_in_zip64_read_info_s* pfile_in_zip_read; /* structure about the current
- file if we are decompressing it */
- int encrypted;
-
- int isZip64;
-
-# ifndef NOUNCRYPT
- unsigned long keys[3]; /* keys defining the pseudo-random sequence */
- const unsigned long* pcrc_32_tab;
-# endif
-} unz64_s;
-
-
-#ifndef NOUNCRYPT
-#include "crypt.h"
-#endif
-
-/* ===========================================================================
- Read a byte from a gz_stream; update next_in and avail_in. Return EOF
- for end of file.
- IN assertion: the stream s has been sucessfully opened for reading.
-*/
-
-
-local int unz64local_getByte OF((
- const zlib_filefunc64_32_def* pzlib_filefunc_def,
- voidpf filestream,
- int *pi));
-
-local int unz64local_getByte(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, int *pi)
-{
- unsigned char c;
- int err = (int)ZREAD64(*pzlib_filefunc_def,filestream,&c,1);
- if (err==1)
- {
- *pi = (int)c;
- return UNZ_OK;
- }
- else
- {
- if (ZERROR64(*pzlib_filefunc_def,filestream))
- return UNZ_ERRNO;
- else
- return UNZ_EOF;
- }
-}
-
-
-/* ===========================================================================
- Reads a long in LSB order from the given gz_stream. Sets
-*/
-local int unz64local_getShort OF((
- const zlib_filefunc64_32_def* pzlib_filefunc_def,
- voidpf filestream,
- uLong *pX));
-
-local int unz64local_getShort (const zlib_filefunc64_32_def* pzlib_filefunc_def,
- voidpf filestream,
- uLong *pX)
-{
- uLong x ;
- int i = 0;
- int err;
-
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
- x = (uLong)i;
-
- if (err==UNZ_OK)
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
- x |= ((uLong)i)<<8;
-
- if (err==UNZ_OK)
- *pX = x;
- else
- *pX = 0;
- return err;
-}
-
-local int unz64local_getLong OF((
- const zlib_filefunc64_32_def* pzlib_filefunc_def,
- voidpf filestream,
- uLong *pX));
-
-local int unz64local_getLong (const zlib_filefunc64_32_def* pzlib_filefunc_def,
- voidpf filestream,
- uLong *pX)
-{
- uLong x ;
- int i = 0;
- int err;
-
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
- x = (uLong)i;
-
- if (err==UNZ_OK)
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
- x |= ((uLong)i)<<8;
-
- if (err==UNZ_OK)
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
- x |= ((uLong)i)<<16;
-
- if (err==UNZ_OK)
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
- x += ((uLong)i)<<24;
-
- if (err==UNZ_OK)
- *pX = x;
- else
- *pX = 0;
- return err;
-}
-
-local int unz64local_getLong64 OF((
- const zlib_filefunc64_32_def* pzlib_filefunc_def,
- voidpf filestream,
- ZPOS64_T *pX));
-
-
-local int unz64local_getLong64 (const zlib_filefunc64_32_def* pzlib_filefunc_def,
- voidpf filestream,
- ZPOS64_T *pX)
-{
- ZPOS64_T x ;
- int i = 0;
- int err;
-
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
- x = (ZPOS64_T)i;
-
- if (err==UNZ_OK)
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
- x |= ((ZPOS64_T)i)<<8;
-
- if (err==UNZ_OK)
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
- x |= ((ZPOS64_T)i)<<16;
-
- if (err==UNZ_OK)
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
- x |= ((ZPOS64_T)i)<<24;
-
- if (err==UNZ_OK)
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
- x |= ((ZPOS64_T)i)<<32;
-
- if (err==UNZ_OK)
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
- x |= ((ZPOS64_T)i)<<40;
-
- if (err==UNZ_OK)
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
- x |= ((ZPOS64_T)i)<<48;
-
- if (err==UNZ_OK)
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
- x |= ((ZPOS64_T)i)<<56;
-
- if (err==UNZ_OK)
- *pX = x;
- else
- *pX = 0;
- return err;
-}
-
-/* My own strcmpi / strcasecmp */
-local int strcmpcasenosensitive_internal (const char* fileName1, const char* fileName2)
-{
- for (;;)
- {
- char c1=*(fileName1++);
- char c2=*(fileName2++);
- if ((c1>='a') && (c1<='z'))
- c1 -= 0x20;
- if ((c2>='a') && (c2<='z'))
- c2 -= 0x20;
- if (c1=='\0')
- return ((c2=='\0') ? 0 : -1);
- if (c2=='\0')
- return 1;
- if (c1<c2)
- return -1;
- if (c1>c2)
- return 1;
- }
-}
-
-
-#ifdef CASESENSITIVITYDEFAULT_NO
-#define CASESENSITIVITYDEFAULTVALUE 2
-#else
-#define CASESENSITIVITYDEFAULTVALUE 1
-#endif
-
-#ifndef STRCMPCASENOSENTIVEFUNCTION
-#define STRCMPCASENOSENTIVEFUNCTION strcmpcasenosensitive_internal
-#endif
-
-/*
- Compare two filename (fileName1,fileName2).
- If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
- If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
- or strcasecmp)
- If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
- (like 1 on Unix, 2 on Windows)
-
-*/
-extern int ZEXPORT unzStringFileNameCompare (const char* fileName1,
- const char* fileName2,
- int iCaseSensitivity)
-
-{
- if (iCaseSensitivity==0)
- iCaseSensitivity=CASESENSITIVITYDEFAULTVALUE;
-
- if (iCaseSensitivity==1)
- return strcmp(fileName1,fileName2);
-
- return STRCMPCASENOSENTIVEFUNCTION(fileName1,fileName2);
-}
-
-#ifndef BUFREADCOMMENT
-#define BUFREADCOMMENT (0x400)
-#endif
-
-/*
- Locate the Central directory of a zipfile (at the end, just before
- the global comment)
-*/
-local ZPOS64_T unz64local_SearchCentralDir OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream));
-local ZPOS64_T unz64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream)
-{
- unsigned char* buf;
- ZPOS64_T uSizeFile;
- ZPOS64_T uBackRead;
- ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
- ZPOS64_T uPosFound=0;
-
- if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
- return 0;
-
-
- uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
-
- if (uMaxBack>uSizeFile)
- uMaxBack = uSizeFile;
-
- buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
- if (buf==NULL)
- return 0;
-
- uBackRead = 4;
- while (uBackRead<uMaxBack)
- {
- uLong uReadSize;
- ZPOS64_T uReadPos ;
- int i;
- if (uBackRead+BUFREADCOMMENT>uMaxBack)
- uBackRead = uMaxBack;
- else
- uBackRead+=BUFREADCOMMENT;
- uReadPos = uSizeFile-uBackRead ;
-
- uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
- (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
- if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
- break;
-
- if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
- break;
-
- for (i=(int)uReadSize-3; (i--)>0;)
- if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
- ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
- {
- uPosFound = uReadPos+i;
- break;
- }
-
- if (uPosFound!=0)
- break;
- }
- TRYFREE(buf);
- return uPosFound;
-}
-
-
-/*
- Locate the Central directory 64 of a zipfile (at the end, just before
- the global comment)
-*/
-local ZPOS64_T unz64local_SearchCentralDir64 OF((
- const zlib_filefunc64_32_def* pzlib_filefunc_def,
- voidpf filestream));
-
-local ZPOS64_T unz64local_SearchCentralDir64(const zlib_filefunc64_32_def* pzlib_filefunc_def,
- voidpf filestream)
-{
- unsigned char* buf;
- ZPOS64_T uSizeFile;
- ZPOS64_T uBackRead;
- ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
- ZPOS64_T uPosFound=0;
- uLong uL;
- ZPOS64_T relativeOffset;
-
- if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
- return 0;
-
-
- uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
-
- if (uMaxBack>uSizeFile)
- uMaxBack = uSizeFile;
-
- buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
- if (buf==NULL)
- return 0;
-
- uBackRead = 4;
- while (uBackRead<uMaxBack)
- {
- uLong uReadSize;
- ZPOS64_T uReadPos;
- int i;
- if (uBackRead+BUFREADCOMMENT>uMaxBack)
- uBackRead = uMaxBack;
- else
- uBackRead+=BUFREADCOMMENT;
- uReadPos = uSizeFile-uBackRead ;
-
- uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
- (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
- if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
- break;
-
- if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
- break;
-
- for (i=(int)uReadSize-3; (i--)>0;)
- if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
- ((*(buf+i+2))==0x06) && ((*(buf+i+3))==0x07))
- {
- uPosFound = uReadPos+i;
- break;
- }
-
- if (uPosFound!=0)
- break;
- }
- TRYFREE(buf);
- if (uPosFound == 0)
- return 0;