1
0

Merge pull request #484 from worktycho/cmake-fixes

fixes for mac os x
This commit is contained in:
Alexander Harkness 2014-01-01 10:15:21 -08:00
commit bb0d43f70e
4 changed files with 41 additions and 953 deletions

View File

@ -46,6 +46,11 @@ endif()
if(MSVC) if(MSVC)
# Make build use multiple threads under MSVC: # Make build use multiple threads under MSVC:
add_flags("/MP") add_flags("/MP")
elseif(APPLE)
#on os x clang adds pthread for us but we need to add it for gcc
if (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
add_flags("-pthread")
endif()
else() else()
# Let gcc / clang know that we're compiling a multi-threaded app: # Let gcc / clang know that we're compiling a multi-threaded app:
add_flags("-pthread") add_flags("-pthread")
@ -111,17 +116,8 @@ add_subdirectory(lib/md5/)
# We do not do that for MSVC since MSVC produces an awful lot of warnings for its own STL headers; # We do not do that for MSVC since MSVC produces an awful lot of warnings for its own STL headers;
# the important warnings will be turned on using #pragma in Globals.h # the important warnings will be turned on using #pragma in Globals.h
if (NOT MSVC) if (NOT MSVC)
#TODO: set -Wall -Werror -Wextra
add_flags("-Wall -Wextra") add_flags("-Wall -Wextra")
endif() endif()
if (NOT WIN32)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -rdynamic")
set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -rdynamic")
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -rdynamic")
set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_PROFILE} -rdynamic")
endif()
add_subdirectory (src) add_subdirectory (src)

View File

@ -1,944 +0,0 @@
# CMAKE generated file: DO NOT EDIT!
# Generated by "Unix Makefiles" Generator, CMake Version 2.8
# Default target executed when no arguments are given to make.
default_target: all
.PHONY : default_target
#=============================================================================
# Special targets provided by cmake.
# Disable implicit rules so canonical targets will work.
.SUFFIXES:
# Remove some rules from gmake that .SUFFIXES does not remove.
SUFFIXES =
.SUFFIXES: .hpux_make_needs_suffix_list
# Suppress display of executed commands.
$(VERBOSE).SILENT:
# A target that is always out of date.
cmake_force:
.PHONY : cmake_force
#=============================================================================
# Set environment variables for the build.
# The shell in which to execute make rules.
SHELL = /bin/sh
# The CMake executable.
CMAKE_COMMAND = /usr/bin/cmake
# The command to remove a file.
RM = /usr/bin/cmake -E remove -f
# The top-level source directory on which CMake was run.
CMAKE_SOURCE_DIR = /home/tycho/MCServer
# The top-level build directory on which CMake was run.
CMAKE_BINARY_DIR = /home/tycho/MCServer
#=============================================================================
# Targets provided globally by CMake.
# Special rule for the target edit_cache
edit_cache:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
/usr/bin/cmake -i .
.PHONY : edit_cache
# Special rule for the target edit_cache
edit_cache/fast: edit_cache
.PHONY : edit_cache/fast
# Special rule for the target rebuild_cache
rebuild_cache:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : rebuild_cache
# Special rule for the target rebuild_cache
rebuild_cache/fast: rebuild_cache
.PHONY : rebuild_cache/fast
# The main all target
all: cmake_check_build_system
cd /home/tycho/MCServer && $(CMAKE_COMMAND) -E cmake_progress_start /home/tycho/MCServer/CMakeFiles /home/tycho/MCServer/lib/lua/CMakeFiles/progress.marks
cd /home/tycho/MCServer && $(MAKE) -f CMakeFiles/Makefile2 lib/lua/all
$(CMAKE_COMMAND) -E cmake_progress_start /home/tycho/MCServer/CMakeFiles 0
.PHONY : all
# The main clean target
clean:
cd /home/tycho/MCServer && $(MAKE) -f CMakeFiles/Makefile2 lib/lua/clean
.PHONY : clean
# The main clean target
clean/fast: clean
.PHONY : clean/fast
# Prepare targets for installation.
preinstall: all
cd /home/tycho/MCServer && $(MAKE) -f CMakeFiles/Makefile2 lib/lua/preinstall
.PHONY : preinstall
# Prepare targets for installation.
preinstall/fast:
cd /home/tycho/MCServer && $(MAKE) -f CMakeFiles/Makefile2 lib/lua/preinstall
.PHONY : preinstall/fast
# clear depends
depend:
cd /home/tycho/MCServer && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
.PHONY : depend
# Convenience name for target.
lib/lua/CMakeFiles/lua.dir/rule:
cd /home/tycho/MCServer && $(MAKE) -f CMakeFiles/Makefile2 lib/lua/CMakeFiles/lua.dir/rule
.PHONY : lib/lua/CMakeFiles/lua.dir/rule
# Convenience name for target.
lua: lib/lua/CMakeFiles/lua.dir/rule
.PHONY : lua
# fast build rule for target.
lua/fast:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/build
.PHONY : lua/fast
src/lapi.o: src/lapi.c.o
.PHONY : src/lapi.o
# target to build an object file
src/lapi.c.o:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lapi.c.o
.PHONY : src/lapi.c.o
src/lapi.i: src/lapi.c.i
.PHONY : src/lapi.i
# target to preprocess a source file
src/lapi.c.i:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lapi.c.i
.PHONY : src/lapi.c.i
src/lapi.s: src/lapi.c.s
.PHONY : src/lapi.s
# target to generate assembly for a file
src/lapi.c.s:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lapi.c.s
.PHONY : src/lapi.c.s
src/lauxlib.o: src/lauxlib.c.o
.PHONY : src/lauxlib.o
# target to build an object file
src/lauxlib.c.o:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lauxlib.c.o
.PHONY : src/lauxlib.c.o
src/lauxlib.i: src/lauxlib.c.i
.PHONY : src/lauxlib.i
# target to preprocess a source file
src/lauxlib.c.i:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lauxlib.c.i
.PHONY : src/lauxlib.c.i
src/lauxlib.s: src/lauxlib.c.s
.PHONY : src/lauxlib.s
# target to generate assembly for a file
src/lauxlib.c.s:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lauxlib.c.s
.PHONY : src/lauxlib.c.s
src/lbaselib.o: src/lbaselib.c.o
.PHONY : src/lbaselib.o
# target to build an object file
src/lbaselib.c.o:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lbaselib.c.o
.PHONY : src/lbaselib.c.o
src/lbaselib.i: src/lbaselib.c.i
.PHONY : src/lbaselib.i
# target to preprocess a source file
src/lbaselib.c.i:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lbaselib.c.i
.PHONY : src/lbaselib.c.i
src/lbaselib.s: src/lbaselib.c.s
.PHONY : src/lbaselib.s
# target to generate assembly for a file
src/lbaselib.c.s:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lbaselib.c.s
.PHONY : src/lbaselib.c.s
src/lcode.o: src/lcode.c.o
.PHONY : src/lcode.o
# target to build an object file
src/lcode.c.o:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lcode.c.o
.PHONY : src/lcode.c.o
src/lcode.i: src/lcode.c.i
.PHONY : src/lcode.i
# target to preprocess a source file
src/lcode.c.i:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lcode.c.i
.PHONY : src/lcode.c.i
src/lcode.s: src/lcode.c.s
.PHONY : src/lcode.s
# target to generate assembly for a file
src/lcode.c.s:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lcode.c.s
.PHONY : src/lcode.c.s
src/ldblib.o: src/ldblib.c.o
.PHONY : src/ldblib.o
# target to build an object file
src/ldblib.c.o:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/ldblib.c.o
.PHONY : src/ldblib.c.o
src/ldblib.i: src/ldblib.c.i
.PHONY : src/ldblib.i
# target to preprocess a source file
src/ldblib.c.i:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/ldblib.c.i
.PHONY : src/ldblib.c.i
src/ldblib.s: src/ldblib.c.s
.PHONY : src/ldblib.s
# target to generate assembly for a file
src/ldblib.c.s:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/ldblib.c.s
.PHONY : src/ldblib.c.s
src/ldebug.o: src/ldebug.c.o
.PHONY : src/ldebug.o
# target to build an object file
src/ldebug.c.o:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/ldebug.c.o
.PHONY : src/ldebug.c.o
src/ldebug.i: src/ldebug.c.i
.PHONY : src/ldebug.i
# target to preprocess a source file
src/ldebug.c.i:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/ldebug.c.i
.PHONY : src/ldebug.c.i
src/ldebug.s: src/ldebug.c.s
.PHONY : src/ldebug.s
# target to generate assembly for a file
src/ldebug.c.s:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/ldebug.c.s
.PHONY : src/ldebug.c.s
src/ldo.o: src/ldo.c.o
.PHONY : src/ldo.o
# target to build an object file
src/ldo.c.o:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/ldo.c.o
.PHONY : src/ldo.c.o
src/ldo.i: src/ldo.c.i
.PHONY : src/ldo.i
# target to preprocess a source file
src/ldo.c.i:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/ldo.c.i
.PHONY : src/ldo.c.i
src/ldo.s: src/ldo.c.s
.PHONY : src/ldo.s
# target to generate assembly for a file
src/ldo.c.s:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/ldo.c.s
.PHONY : src/ldo.c.s
src/ldump.o: src/ldump.c.o
.PHONY : src/ldump.o
# target to build an object file
src/ldump.c.o:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/ldump.c.o
.PHONY : src/ldump.c.o
src/ldump.i: src/ldump.c.i
.PHONY : src/ldump.i
# target to preprocess a source file
src/ldump.c.i:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/ldump.c.i
.PHONY : src/ldump.c.i
src/ldump.s: src/ldump.c.s
.PHONY : src/ldump.s
# target to generate assembly for a file
src/ldump.c.s:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/ldump.c.s
.PHONY : src/ldump.c.s
src/lfunc.o: src/lfunc.c.o
.PHONY : src/lfunc.o
# target to build an object file
src/lfunc.c.o:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lfunc.c.o
.PHONY : src/lfunc.c.o
src/lfunc.i: src/lfunc.c.i
.PHONY : src/lfunc.i
# target to preprocess a source file
src/lfunc.c.i:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lfunc.c.i
.PHONY : src/lfunc.c.i
src/lfunc.s: src/lfunc.c.s
.PHONY : src/lfunc.s
# target to generate assembly for a file
src/lfunc.c.s:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lfunc.c.s
.PHONY : src/lfunc.c.s
src/lgc.o: src/lgc.c.o
.PHONY : src/lgc.o
# target to build an object file
src/lgc.c.o:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lgc.c.o
.PHONY : src/lgc.c.o
src/lgc.i: src/lgc.c.i
.PHONY : src/lgc.i
# target to preprocess a source file
src/lgc.c.i:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lgc.c.i
.PHONY : src/lgc.c.i
src/lgc.s: src/lgc.c.s
.PHONY : src/lgc.s
# target to generate assembly for a file
src/lgc.c.s:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lgc.c.s
.PHONY : src/lgc.c.s
src/linit.o: src/linit.c.o
.PHONY : src/linit.o
# target to build an object file
src/linit.c.o:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/linit.c.o
.PHONY : src/linit.c.o
src/linit.i: src/linit.c.i
.PHONY : src/linit.i
# target to preprocess a source file
src/linit.c.i:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/linit.c.i
.PHONY : src/linit.c.i
src/linit.s: src/linit.c.s
.PHONY : src/linit.s
# target to generate assembly for a file
src/linit.c.s:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/linit.c.s
.PHONY : src/linit.c.s
src/liolib.o: src/liolib.c.o
.PHONY : src/liolib.o
# target to build an object file
src/liolib.c.o:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/liolib.c.o
.PHONY : src/liolib.c.o
src/liolib.i: src/liolib.c.i
.PHONY : src/liolib.i
# target to preprocess a source file
src/liolib.c.i:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/liolib.c.i
.PHONY : src/liolib.c.i
src/liolib.s: src/liolib.c.s
.PHONY : src/liolib.s
# target to generate assembly for a file
src/liolib.c.s:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/liolib.c.s
.PHONY : src/liolib.c.s
src/llex.o: src/llex.c.o
.PHONY : src/llex.o
# target to build an object file
src/llex.c.o:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/llex.c.o
.PHONY : src/llex.c.o
src/llex.i: src/llex.c.i
.PHONY : src/llex.i
# target to preprocess a source file
src/llex.c.i:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/llex.c.i
.PHONY : src/llex.c.i
src/llex.s: src/llex.c.s
.PHONY : src/llex.s
# target to generate assembly for a file
src/llex.c.s:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/llex.c.s
.PHONY : src/llex.c.s
src/lmathlib.o: src/lmathlib.c.o
.PHONY : src/lmathlib.o
# target to build an object file
src/lmathlib.c.o:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lmathlib.c.o
.PHONY : src/lmathlib.c.o
src/lmathlib.i: src/lmathlib.c.i
.PHONY : src/lmathlib.i
# target to preprocess a source file
src/lmathlib.c.i:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lmathlib.c.i
.PHONY : src/lmathlib.c.i
src/lmathlib.s: src/lmathlib.c.s
.PHONY : src/lmathlib.s
# target to generate assembly for a file
src/lmathlib.c.s:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lmathlib.c.s
.PHONY : src/lmathlib.c.s
src/lmem.o: src/lmem.c.o
.PHONY : src/lmem.o
# target to build an object file
src/lmem.c.o:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lmem.c.o
.PHONY : src/lmem.c.o
src/lmem.i: src/lmem.c.i
.PHONY : src/lmem.i
# target to preprocess a source file
src/lmem.c.i:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lmem.c.i
.PHONY : src/lmem.c.i
src/lmem.s: src/lmem.c.s
.PHONY : src/lmem.s
# target to generate assembly for a file
src/lmem.c.s:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lmem.c.s
.PHONY : src/lmem.c.s
src/loadlib.o: src/loadlib.c.o
.PHONY : src/loadlib.o
# target to build an object file
src/loadlib.c.o:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/loadlib.c.o
.PHONY : src/loadlib.c.o
src/loadlib.i: src/loadlib.c.i
.PHONY : src/loadlib.i
# target to preprocess a source file
src/loadlib.c.i:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/loadlib.c.i
.PHONY : src/loadlib.c.i
src/loadlib.s: src/loadlib.c.s
.PHONY : src/loadlib.s
# target to generate assembly for a file
src/loadlib.c.s:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/loadlib.c.s
.PHONY : src/loadlib.c.s
src/lobject.o: src/lobject.c.o
.PHONY : src/lobject.o
# target to build an object file
src/lobject.c.o:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lobject.c.o
.PHONY : src/lobject.c.o
src/lobject.i: src/lobject.c.i
.PHONY : src/lobject.i
# target to preprocess a source file
src/lobject.c.i:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lobject.c.i
.PHONY : src/lobject.c.i
src/lobject.s: src/lobject.c.s
.PHONY : src/lobject.s
# target to generate assembly for a file
src/lobject.c.s:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lobject.c.s
.PHONY : src/lobject.c.s
src/lopcodes.o: src/lopcodes.c.o
.PHONY : src/lopcodes.o
# target to build an object file
src/lopcodes.c.o:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lopcodes.c.o
.PHONY : src/lopcodes.c.o
src/lopcodes.i: src/lopcodes.c.i
.PHONY : src/lopcodes.i
# target to preprocess a source file
src/lopcodes.c.i:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lopcodes.c.i
.PHONY : src/lopcodes.c.i
src/lopcodes.s: src/lopcodes.c.s
.PHONY : src/lopcodes.s
# target to generate assembly for a file
src/lopcodes.c.s:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lopcodes.c.s
.PHONY : src/lopcodes.c.s
src/loslib.o: src/loslib.c.o
.PHONY : src/loslib.o
# target to build an object file
src/loslib.c.o:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/loslib.c.o
.PHONY : src/loslib.c.o
src/loslib.i: src/loslib.c.i
.PHONY : src/loslib.i
# target to preprocess a source file
src/loslib.c.i:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/loslib.c.i
.PHONY : src/loslib.c.i
src/loslib.s: src/loslib.c.s
.PHONY : src/loslib.s
# target to generate assembly for a file
src/loslib.c.s:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/loslib.c.s
.PHONY : src/loslib.c.s
src/lparser.o: src/lparser.c.o
.PHONY : src/lparser.o
# target to build an object file
src/lparser.c.o:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lparser.c.o
.PHONY : src/lparser.c.o
src/lparser.i: src/lparser.c.i
.PHONY : src/lparser.i
# target to preprocess a source file
src/lparser.c.i:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lparser.c.i
.PHONY : src/lparser.c.i
src/lparser.s: src/lparser.c.s
.PHONY : src/lparser.s
# target to generate assembly for a file
src/lparser.c.s:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lparser.c.s
.PHONY : src/lparser.c.s
src/lstate.o: src/lstate.c.o
.PHONY : src/lstate.o
# target to build an object file
src/lstate.c.o:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lstate.c.o
.PHONY : src/lstate.c.o
src/lstate.i: src/lstate.c.i
.PHONY : src/lstate.i
# target to preprocess a source file
src/lstate.c.i:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lstate.c.i
.PHONY : src/lstate.c.i
src/lstate.s: src/lstate.c.s
.PHONY : src/lstate.s
# target to generate assembly for a file
src/lstate.c.s:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lstate.c.s
.PHONY : src/lstate.c.s
src/lstring.o: src/lstring.c.o
.PHONY : src/lstring.o
# target to build an object file
src/lstring.c.o:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lstring.c.o
.PHONY : src/lstring.c.o
src/lstring.i: src/lstring.c.i
.PHONY : src/lstring.i
# target to preprocess a source file
src/lstring.c.i:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lstring.c.i
.PHONY : src/lstring.c.i
src/lstring.s: src/lstring.c.s
.PHONY : src/lstring.s
# target to generate assembly for a file
src/lstring.c.s:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lstring.c.s
.PHONY : src/lstring.c.s
src/lstrlib.o: src/lstrlib.c.o
.PHONY : src/lstrlib.o
# target to build an object file
src/lstrlib.c.o:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lstrlib.c.o
.PHONY : src/lstrlib.c.o
src/lstrlib.i: src/lstrlib.c.i
.PHONY : src/lstrlib.i
# target to preprocess a source file
src/lstrlib.c.i:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lstrlib.c.i
.PHONY : src/lstrlib.c.i
src/lstrlib.s: src/lstrlib.c.s
.PHONY : src/lstrlib.s
# target to generate assembly for a file
src/lstrlib.c.s:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lstrlib.c.s
.PHONY : src/lstrlib.c.s
src/ltable.o: src/ltable.c.o
.PHONY : src/ltable.o
# target to build an object file
src/ltable.c.o:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/ltable.c.o
.PHONY : src/ltable.c.o
src/ltable.i: src/ltable.c.i
.PHONY : src/ltable.i
# target to preprocess a source file
src/ltable.c.i:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/ltable.c.i
.PHONY : src/ltable.c.i
src/ltable.s: src/ltable.c.s
.PHONY : src/ltable.s
# target to generate assembly for a file
src/ltable.c.s:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/ltable.c.s
.PHONY : src/ltable.c.s
src/ltablib.o: src/ltablib.c.o
.PHONY : src/ltablib.o
# target to build an object file
src/ltablib.c.o:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/ltablib.c.o
.PHONY : src/ltablib.c.o
src/ltablib.i: src/ltablib.c.i
.PHONY : src/ltablib.i
# target to preprocess a source file
src/ltablib.c.i:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/ltablib.c.i
.PHONY : src/ltablib.c.i
src/ltablib.s: src/ltablib.c.s
.PHONY : src/ltablib.s
# target to generate assembly for a file
src/ltablib.c.s:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/ltablib.c.s
.PHONY : src/ltablib.c.s
src/ltm.o: src/ltm.c.o
.PHONY : src/ltm.o
# target to build an object file
src/ltm.c.o:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/ltm.c.o
.PHONY : src/ltm.c.o
src/ltm.i: src/ltm.c.i
.PHONY : src/ltm.i
# target to preprocess a source file
src/ltm.c.i:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/ltm.c.i
.PHONY : src/ltm.c.i
src/ltm.s: src/ltm.c.s
.PHONY : src/ltm.s
# target to generate assembly for a file
src/ltm.c.s:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/ltm.c.s
.PHONY : src/ltm.c.s
src/lundump.o: src/lundump.c.o
.PHONY : src/lundump.o
# target to build an object file
src/lundump.c.o:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lundump.c.o
.PHONY : src/lundump.c.o
src/lundump.i: src/lundump.c.i
.PHONY : src/lundump.i
# target to preprocess a source file
src/lundump.c.i:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lundump.c.i
.PHONY : src/lundump.c.i
src/lundump.s: src/lundump.c.s
.PHONY : src/lundump.s
# target to generate assembly for a file
src/lundump.c.s:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lundump.c.s
.PHONY : src/lundump.c.s
src/lvm.o: src/lvm.c.o
.PHONY : src/lvm.o
# target to build an object file
src/lvm.c.o:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lvm.c.o
.PHONY : src/lvm.c.o
src/lvm.i: src/lvm.c.i
.PHONY : src/lvm.i
# target to preprocess a source file
src/lvm.c.i:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lvm.c.i
.PHONY : src/lvm.c.i
src/lvm.s: src/lvm.c.s
.PHONY : src/lvm.s
# target to generate assembly for a file
src/lvm.c.s:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lvm.c.s
.PHONY : src/lvm.c.s
src/lzio.o: src/lzio.c.o
.PHONY : src/lzio.o
# target to build an object file
src/lzio.c.o:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lzio.c.o
.PHONY : src/lzio.c.o
src/lzio.i: src/lzio.c.i
.PHONY : src/lzio.i
# target to preprocess a source file
src/lzio.c.i:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lzio.c.i
.PHONY : src/lzio.c.i
src/lzio.s: src/lzio.c.s
.PHONY : src/lzio.s
# target to generate assembly for a file
src/lzio.c.s:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lzio.c.s
.PHONY : src/lzio.c.s
src/print.o: src/print.c.o
.PHONY : src/print.o
# target to build an object file
src/print.c.o:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/print.c.o
.PHONY : src/print.c.o
src/print.i: src/print.c.i
.PHONY : src/print.i
# target to preprocess a source file
src/print.c.i:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/print.c.i
.PHONY : src/print.c.i
src/print.s: src/print.c.s
.PHONY : src/print.s
# target to generate assembly for a file
src/print.c.s:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/print.c.s
.PHONY : src/print.c.s
# Help Target
help:
@echo "The following are some of the valid targets for this Makefile:"
@echo "... all (the default if no target is provided)"
@echo "... clean"
@echo "... depend"
@echo "... edit_cache"
@echo "... lua"
@echo "... rebuild_cache"
@echo "... src/lapi.o"
@echo "... src/lapi.i"
@echo "... src/lapi.s"
@echo "... src/lauxlib.o"
@echo "... src/lauxlib.i"
@echo "... src/lauxlib.s"
@echo "... src/lbaselib.o"
@echo "... src/lbaselib.i"
@echo "... src/lbaselib.s"
@echo "... src/lcode.o"
@echo "... src/lcode.i"
@echo "... src/lcode.s"
@echo "... src/ldblib.o"
@echo "... src/ldblib.i"
@echo "... src/ldblib.s"
@echo "... src/ldebug.o"
@echo "... src/ldebug.i"
@echo "... src/ldebug.s"
@echo "... src/ldo.o"
@echo "... src/ldo.i"
@echo "... src/ldo.s"
@echo "... src/ldump.o"
@echo "... src/ldump.i"
@echo "... src/ldump.s"
@echo "... src/lfunc.o"
@echo "... src/lfunc.i"
@echo "... src/lfunc.s"
@echo "... src/lgc.o"
@echo "... src/lgc.i"
@echo "... src/lgc.s"
@echo "... src/linit.o"
@echo "... src/linit.i"
@echo "... src/linit.s"
@echo "... src/liolib.o"
@echo "... src/liolib.i"
@echo "... src/liolib.s"
@echo "... src/llex.o"
@echo "... src/llex.i"
@echo "... src/llex.s"
@echo "... src/lmathlib.o"
@echo "... src/lmathlib.i"
@echo "... src/lmathlib.s"
@echo "... src/lmem.o"
@echo "... src/lmem.i"
@echo "... src/lmem.s"
@echo "... src/loadlib.o"
@echo "... src/loadlib.i"
@echo "... src/loadlib.s"
@echo "... src/lobject.o"
@echo "... src/lobject.i"
@echo "... src/lobject.s"
@echo "... src/lopcodes.o"
@echo "... src/lopcodes.i"
@echo "... src/lopcodes.s"
@echo "... src/loslib.o"
@echo "... src/loslib.i"
@echo "... src/loslib.s"
@echo "... src/lparser.o"
@echo "... src/lparser.i"
@echo "... src/lparser.s"
@echo "... src/lstate.o"
@echo "... src/lstate.i"
@echo "... src/lstate.s"
@echo "... src/lstring.o"
@echo "... src/lstring.i"
@echo "... src/lstring.s"
@echo "... src/lstrlib.o"
@echo "... src/lstrlib.i"
@echo "... src/lstrlib.s"
@echo "... src/ltable.o"
@echo "... src/ltable.i"
@echo "... src/ltable.s"
@echo "... src/ltablib.o"
@echo "... src/ltablib.i"
@echo "... src/ltablib.s"
@echo "... src/ltm.o"
@echo "... src/ltm.i"
@echo "... src/ltm.s"
@echo "... src/lundump.o"
@echo "... src/lundump.i"
@echo "... src/lundump.s"
@echo "... src/lvm.o"
@echo "... src/lvm.i"
@echo "... src/lvm.s"
@echo "... src/lzio.o"
@echo "... src/lzio.i"
@echo "... src/lzio.s"
@echo "... src/print.o"
@echo "... src/print.i"
@echo "... src/print.s"
.PHONY : help
#=============================================================================
# Special targets to cleanup operation of make.
# Special rule to run CMake to check the build system integrity.
# No rule that depends on this can have commands that come from listfiles
# because they might be regenerated.
cmake_check_build_system:
cd /home/tycho/MCServer && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system

View File

@ -529,6 +529,7 @@ void cChunk::SpawnMobs(cMobSpawner& a_MobSpawner)
/* /*
NIBBLETYPE SkyLight = 0; NIBBLETYPE SkyLight = 0;
NIBBLETYPE BlockLight = 0; NIBBLETYPE BlockLight = 0;
*/ */
@ -2898,3 +2899,7 @@ NIBBLETYPE cChunk::GetTimeAlteredLight(NIBBLETYPE a_Skylight) const

31
src/OSSupport/Queue.h Normal file
View File

@ -0,0 +1,31 @@
#pragma once
template<class T>
class cDeleter
{
public:
static void Delete(T) {};
};
template<class T, class D = cDeleter<T>>
class cQueue
{
public:
cQueue(int warnsize);
cQueue(cQueue<T>& queue);
~cQueue();
void EnqueueItem(T item);
bool TryDequeueItem(T& item);
T DequeueItem();
void BlockTillEmpty(cEvent CancelationEvent);
void Clear();
int Size();
private:
int warnsize;
std::list<T> contents;
};
//template classes must be implemented in the header
#include "Queue.inc"