Merge branch 'master' into theyhunger

cl_dll/CMakeLists.txt

@@ -30,6 +30,7 @@ add_definitions(-DCLIENT_DLL)
 if(NOT MSVC)
 	add_compile_options(-fno-exceptions) # GCC/Clang flag
 	add_compile_options(-Wno-write-strings) # GCC/Clang flag
+	add_compile_options(-fvisibility=hidden) # GCC/Clang flag
 	add_definitions(-D_LINUX -DLINUX) # It seems enough for all non-Win32 systems
 	add_definitions(-Dstricmp=strcasecmp -Dstrnicmp=strncasecmp)
 	if(NOT MINGW)

dlls/CMakeLists.txt

@@ -30,6 +30,7 @@ add_definitions(-DCROWBAR_IDLE_ANIM)
 if(NOT MSVC)
 	add_compile_options(-fno-exceptions) # GCC/Clang flag
 	add_compile_options(-Wno-invalid-offsetof) # GCC/Clang flag
+	add_compile_options(-fvisibility=hidden) # GCC/Clang flag
 	add_definitions(-D_LINUX) # It seems enough for all non-Win32 systems
 	add_definitions(-Dstricmp=strcasecmp -Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_vsnprintf=vsnprintf )
 else()
@@ -157,8 +158,13 @@ set(SVDLL_SOURCES
 	../pm_shared/pm_math.c
 	../pm_shared/pm_shared.c
 )
+<<<<<<< HEAD
 	
 include_directories (. hunger wpn_shared ../common ../engine ../pm_shared ../game_shared ../public)
+=======
+
+include_directories (. wpn_shared ../common ../engine ../pm_shared ../game_shared ../public)
+>>>>>>> master
 
 if(USE_VOICEMGR)
 	set(SVDLL_SOURCES