Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix some crashes and deadlocks #10

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
584c153
link coroutines together in the call stack window. not sure if this …
pondy Jan 22, 2014
1aba8ba
ignore modules without 'lua' in their name
pondy Jan 22, 2014
889eca3
add a command to temporarily disable breaking on error
pondy Mar 20, 2014
16a960d
Merge branch 'pull/unknownworlds_dev' of https://github.com/radent/de…
pondy Mar 20, 2014
2273c4d
Make decoda run in VS 2015 part 1
Yang-Radiant Apr 11, 2016
8064314
update all the libs to be VS1025
Yang-Radiant Apr 11, 2016
9b9929d
update visual studio projects to be VS2015
Yang-Radiant Apr 11, 2016
eac9495
update to lua 5.1.5
Yang-Radiant Apr 12, 2016
a2ed703
use latest
Yang-Radiant Apr 12, 2016
93f3ec4
update to lua 5.1.5 (reverted from commit eac94954def080d1ef259369a08…
Yang-Radiant Apr 12, 2016
e319afb
update to latest version of decoda
Yang-Radiant Apr 12, 2016
79fc754
Fix for adioses.dll injection causing game to hang half the time when…
Yang-Radiant Apr 12, 2016
b8337a1
change all the things to release
Yang-Radiant Apr 12, 2016
2390444
I don't know why but a git attributes file was generated.
Yang-Radiant Apr 12, 2016
049957c
Reapply https://github.com/radent/decoda/commit/889eca359fa4b16d47be0…
Yang-Radiant Apr 12, 2016
b32d03e
add the tiny xml solution so we can load it up and compile it later
Yang-Radiant Apr 12, 2016
52f13fb
add wx xml solution
Yang-Radiant Apr 12, 2016
ac0120a
switch to using wide character
Yang-Radiant Apr 12, 2016
e69b81c
Fix for breakpoints not hitting after doing reload in game from withi…
Yang-Radiant Apr 27, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
63 changes: 63 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
###############################################################################
# Set default behavior to automatically normalize line endings.
###############################################################################
* text=auto

###############################################################################
# Set default behavior for command prompt diff.
#
# This is need for earlier builds of msysgit that does not have it on by
# default for csharp files.
# Note: This is only used by command line
###############################################################################
#*.cs diff=csharp

###############################################################################
# Set the merge driver for project and solution files
#
# Merging from the command prompt will add diff markers to the files if there
# are conflicts (Merging from VS is not affected by the settings below, in VS
# the diff markers are never inserted). Diff markers may cause the following
# file extensions to fail to load in VS. An alternative would be to treat
# these files as binary and thus will always conflict and require user
# intervention with every merge. To do so, just uncomment the entries below
###############################################################################
#*.sln merge=binary
#*.csproj merge=binary
#*.vbproj merge=binary
#*.vcxproj merge=binary
#*.vcproj merge=binary
#*.dbproj merge=binary
#*.fsproj merge=binary
#*.lsproj merge=binary
#*.wixproj merge=binary
#*.modelproj merge=binary
#*.sqlproj merge=binary
#*.wwaproj merge=binary

###############################################################################
# behavior for image files
#
# image files are treated as binary by default.
###############################################################################
#*.jpg binary
#*.png binary
#*.gif binary

###############################################################################
# diff behavior for common document formats
#
# Convert binary document formats to text before diffing them. This feature
# is only available from the command line. Turn it on by uncommenting the
# entries below.
###############################################################################
#*.doc diff=astextplain
#*.DOC diff=astextplain
#*.docx diff=astextplain
#*.DOCX diff=astextplain
#*.dot diff=astextplain
#*.DOT diff=astextplain
#*.pdf diff=astextplain
#*.PDF diff=astextplain
#*.rtf diff=astextplain
#*.RTF diff=astextplain
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
build/*
bin/*
install/output/*
docs/output/*
docs/output/*
libs/*
130 changes: 130 additions & 0 deletions libs/tinyxml/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
#****************************************************************************
#
# Makefile for TinyXml test.
# Lee Thomason
# www.grinninglizard.com
#
# This is a GNU make (gmake) makefile
#****************************************************************************

# DEBUG can be set to YES to include debugging info, or NO otherwise
DEBUG := NO

# PROFILE can be set to YES to include profiling info, or NO otherwise
PROFILE := NO

# TINYXML_USE_STL can be used to turn on STL support. NO, then STL
# will not be used. YES will include the STL files.
TINYXML_USE_STL := NO

#****************************************************************************

CC := gcc
CXX := g++
LD := g++
AR := ar rc
RANLIB := ranlib

DEBUG_CFLAGS := -Wall -Wno-format -g -DDEBUG
RELEASE_CFLAGS := -Wall -Wno-unknown-pragmas -Wno-format -O3

LIBS :=

DEBUG_CXXFLAGS := ${DEBUG_CFLAGS}
RELEASE_CXXFLAGS := ${RELEASE_CFLAGS}

DEBUG_LDFLAGS := -g
RELEASE_LDFLAGS :=

ifeq (YES, ${DEBUG})
CFLAGS := ${DEBUG_CFLAGS}
CXXFLAGS := ${DEBUG_CXXFLAGS}
LDFLAGS := ${DEBUG_LDFLAGS}
else
CFLAGS := ${RELEASE_CFLAGS}
CXXFLAGS := ${RELEASE_CXXFLAGS}
LDFLAGS := ${RELEASE_LDFLAGS}
endif

ifeq (YES, ${PROFILE})
CFLAGS := ${CFLAGS} -pg -O3
CXXFLAGS := ${CXXFLAGS} -pg -O3
LDFLAGS := ${LDFLAGS} -pg
endif

#****************************************************************************
# Preprocessor directives
#****************************************************************************

ifeq (YES, ${TINYXML_USE_STL})
DEFS := -DTIXML_USE_STL
else
DEFS :=
endif

#****************************************************************************
# Include paths
#****************************************************************************

#INCS := -I/usr/include/g++-2 -I/usr/local/include
INCS :=


#****************************************************************************
# Makefile code common to all platforms
#****************************************************************************

CFLAGS := ${CFLAGS} ${DEFS}
CXXFLAGS := ${CXXFLAGS} ${DEFS}

#****************************************************************************
# Targets of the build
#****************************************************************************

OUTPUT := xmltest

all: ${OUTPUT}


#****************************************************************************
# Source files
#****************************************************************************

SRCS := tinyxml.cpp tinyxmlparser.cpp xmltest.cpp tinyxmlerror.cpp tinystr.cpp

# Add on the sources for libraries
SRCS := ${SRCS}

OBJS := $(addsuffix .o,$(basename ${SRCS}))

#****************************************************************************
# Output
#****************************************************************************

${OUTPUT}: ${OBJS}
${LD} -o $@ ${LDFLAGS} ${OBJS} ${LIBS} ${EXTRA_LIBS}

#****************************************************************************
# common rules
#****************************************************************************

# Rules for compiling source files to object files
%.o : %.cpp
${CXX} -c ${CXXFLAGS} ${INCS} $< -o $@

%.o : %.c
${CC} -c ${CFLAGS} ${INCS} $< -o $@

dist:
bash makedistlinux

clean:
-rm -f core ${OBJS} ${OUTPUT}

depend:
#makedepend ${INCS} ${SRCS}

tinyxml.o: tinyxml.h tinystr.h
tinyxmlparser.o: tinyxml.h tinystr.h
xmltest.o: tinyxml.h tinystr.h
tinyxmlerror.o: tinyxml.h tinystr.h