Skip to content
Permalink
Browse files

Merge branch 'master' into Sound_Refactor

  • Loading branch information...
coelckers committed Aug 22, 2019
2 parents c1877a8 + c3edfdd commit 4378cda0bce081799a47ecc33694841852f47649
Showing with 9 additions and 6 deletions.
  1. +6 −1 src/CMakeLists.txt
  2. +2 −0 src/g_pch.h
  3. +1 −0 src/utility/files.h
  4. +0 −5 src/utility/palette.cpp
@@ -1329,7 +1329,12 @@ else()
set( NOT_COMPILED_SOURCE_FILES ${NOT_COMPILED_SOURCE_FILES} ${VM_JIT_SOURCES} )
endif()

enable_precompiled_headers( g_pch.h PCH_SOURCES )
if( MSVC )
enable_precompiled_headers( g_pch.h PCH_SOURCES )
else()
# Temporary solution for compilers other than MSVC
set_source_files_properties( ${PCH_SOURCES} PROPERTIES COMPILE_FLAGS "-include g_pch.h" )
endif()

add_executable( zdoom WIN32 MACOSX_BUNDLE
${HEADER_FILES}
@@ -16,8 +16,10 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <cassert>
#ifdef _MSC_VER
#include <direct.h>
#include <io.h>
#endif // _MSC_VER
#include <limits>
#include <memory>
#include <tuple>
@@ -36,6 +36,7 @@
#ifndef FILES_H
#define FILES_H

#include <stddef.h>
#include <stdio.h>
#include <stdint.h>
#include <functional>
@@ -35,11 +35,6 @@
#include "palette.h"
#include "palentry.h"

#include <float.h>
#include <math.h>
#include <stdlib.h>
#include <string.h>

/****************************/
/* Palette management stuff */
/****************************/

0 comments on commit 4378cda

Please sign in to comment.
You can’t perform that action at this time.