Commit 3ae8c984 authored by Fabian Greffrath's avatar Fabian Greffrath

New upstream version 5.6

parent a5dee248
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
cmake_minimum_required(VERSION 3.7.2)
project("Crispy Doom" VERSION 5.5.2 LANGUAGES C)
project("Crispy Doom" VERSION 5.6.0 LANGUAGES C)
# Autotools variables
set(top_srcdir ${CMAKE_CURRENT_SOURCE_DIR})
......
This diff is collapsed.
AC_INIT(Crispy Doom, 5.5.2,
AC_INIT(Crispy Doom, 5.6.0,
fabian@greffrath.com, crispy-doom)
PACKAGE_SHORTNAME=${PACKAGE_NAME% Doom}
......
......@@ -15,8 +15,11 @@ set(COMMON_SOURCE_FILES
set(DEDSERV_FILES
d_dedicated.c
d_iwad.c d_iwad.h
d_mode.c d_mode.h
deh_str.c deh_str.h
i_timer.c i_timer.h
m_config.c m_config.h
net_common.c net_common.h
net_dedicated.c net_dedicated.h
net_io.c net_io.h
......@@ -216,12 +219,12 @@ if(MSVC)
LINK_FLAGS "/MANIFEST:NO")
endif()
add_executable(midiread midifile.c z_native.c i_system.c m_argv.c m_misc.c)
add_executable(midiread midifile.c z_native.c i_system.c m_argv.c m_misc.c d_iwad.c deh_str.c m_config.c)
target_compile_definitions(midiread PRIVATE "-DTEST")
target_include_directories(midiread PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../")
target_link_libraries(midiread SDL2::SDL2main SDL2::SDL2)
add_executable(mus2mid mus2mid.c memio.c z_native.c i_system.c m_argv.c m_misc.c)
add_executable(mus2mid mus2mid.c memio.c z_native.c i_system.c m_argv.c m_misc.c d_iwad.c deh_str.c m_config.c)
target_compile_definitions(mus2mid PRIVATE "-DSTANDALONE")
target_include_directories(mus2mid PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../")
target_link_libraries(mus2mid SDL2::SDL2main SDL2::SDL2)
......@@ -2691,7 +2691,7 @@ void M_SetMusicPackDir(void)
free(readme_path);
free(music_pack_path);
free(prefdir);
SDL_free(prefdir);
}
//
......@@ -2774,7 +2774,7 @@ char *M_GetAutoloadDir(const char *iwadname)
char *prefdir;
prefdir = SDL_GetPrefPath("", PACKAGE_TARNAME);
autoload_path = M_StringJoin(prefdir, "autoload", NULL);
free(prefdir);
SDL_free(prefdir);
}
M_MakeDirectory(autoload_path);
......
......@@ -1066,7 +1066,7 @@ void ConfigJoystick(TXT_UNCAST_ARG(widget), void *user_data)
AddJoystickControl(window, "Speed", &joybspeed);
}
if (gamemission == hexen || gamemission == strife)
if (gamemission == doom || gamemission == hexen || gamemission == strife) // [crispy]
{
AddJoystickControl(window, "Jump", &joybjump);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment