jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed a minor bug in the gl shader parser

Browse Source
This commit is contained in:
jp9000
2013-10-29 06:01:19 -07:00
parent 93905e516b
commit ab08c2c3f2
9 changed files with 19 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
test/makefile
View File

@@ -1,13 +0,0 @@
include ../config.mak
all: default
PROJECTS=test-input win
.PHONY: all default clean
default: $(PROJECTS)
@$(foreach PROJECT, $(PROJECTS), $(MAKE) -C $(PROJECT);)
clean: $(PROJECTS)
@$(foreach PROJECT, $(PROJECTS), $(MAKE) clean -C $(PROJECT);)

33
test/test-input/makefile
View File

@@ -1,33 +0,0 @@
include ../../config.mak
.PHONY: all default clean
all: default
SRCFILES=test-filter.c test-input.c test-random.c
SONAME=../../build/test-input.$(SOEXT)
OBJS += $(SRCFILES:%.c=%.$(OBJ))
CPPFLAGS += -iquote../../libobs
LDFLAGS += -L../../build -lobs
default: $(SONAME)
.depend:
@rm -f .depend
@$(foreach SRC, $(addprefix $(SRCPATH)/, $(SRCFILES)), $(CCDEP) \
$(CPPFLAGS) $(SRC) \
-MT $(SRC:$(SRCPATH)/%.c=%.$(OBJ)) -MM 1>> .depend;)
$(SONAME): .depend $(OBJS)
$(LD)$@ $(LDFLAGS) $(OBJS)
depend: .depend
ifneq ($(wildcard .depend),)
include .depend
endif
clean:
rm -f $(OBJS) $(SONAME) *.a *.lib *.exp *.pdb .depend

35
test/win/makefile
View File

@@ -1,35 +0,0 @@
include ../../config.mak
.PHONY: all default clean
all: default
SRCFILES=test.cpp
NAME=../../build/wintest$(EXT)
OBJS += $(SRCFILES:%.cpp=%.$(OBJ))
LD=g++ -o
LDFLAGS=-L../../build -lobs -Wl,--subsystem,windows
CPPFLAGS += -I../../libobs -DUNICODE -D_UNICODE
default: $(NAME)
.depend:
@rm -f .depend
@$(foreach SRC, $(addprefix $(SRCPATH)/, $(SRCFILES)), $(CCDEP) \
$(CPPFLAGS) $(SRC) \
-MT $(SRC:$(SRCPATH)/%.c=%.$(OBJ)) -MM 1>> .depend;)
$(NAME): .depend $(OBJS)
$(LD)$@ $(LDFLAGS) $(OBJS)
depend: .depend
ifneq ($(wildcard .depend),)
include .depend
endif
clean:
rm -f $(OBJS) $(NAME) *.a *.lib *.exp *.pdb .depend

4
test/win/test.cpp
View File

@@ -58,8 +58,8 @@ static void do_log(enum log_type type, const char *msg, va_list args)
OutputDebugStringA(bla);
OutputDebugStringA("\n");
/*if (type >= LOG_WARNING)
__debugbreak();*/
if (type >= LOG_WARNING)
__debugbreak();
}
static void CreateOBS(HWND hwnd)