Commit 04eb584e authored by petter's avatar petter

removed binary and added better Makefile for ASM.js version

parent 9bb49f44
......@@ -34,7 +34,7 @@ Player::Player(string filename) {
#ifdef EMSCRIPTEN
font = TTF_OpenFont("sans-serif",20);
#else
font = TTF_OpenFont("/home/user/NetBeansProjects/TTTPlayer/emBuild//Assets/arial.ttf",20);
font = TTF_OpenFont("Assets/arial.ttf",20);
#endif
if(font==NULL)
{
......@@ -45,7 +45,7 @@ Player::Player(string filename) {
#ifdef EMSCRIPTEN
audio=new AudioJS();
#else
audio=new Audio(filename.c_str());
audio=new Audio((filename).c_str());
#endif
if(audio->hasFailed())
......
build/Debug/GNU-Linux-x86/Audio.o: Audio.cpp Audio.h AudioInterface.h
Audio.h:
AudioInterface.h:
build/Debug/GNU-Linux-x86/AudioInterface.o: AudioInterface.cpp \
AudioInterface.h
AudioInterface.h:
build/Debug/GNU-Linux-x86/AudioJS.o: AudioJS.cpp
build/Debug/GNU-Linux-x86/ColorConverter.o: ColorConverter.cpp \
ColorConverter.h
ColorConverter.h:
build/Debug/GNU-Linux-x86/Constants.o: Constants.cpp Constants.h
Constants.h:
build/Debug/GNU-Linux-x86/Controls.o: Controls.cpp Controls.h \
AudioInterface.h ProtocolPreferences.h Video.h Inflater.h SizedArray.h \
Constants.h Messages/Message.h Messages/../Inflater.h \
Messages/../ProtocolPreferences.h Messages/../Constants.h Index.h \
IndexEntry.h Player.h Audio.h
Controls.h:
AudioInterface.h:
ProtocolPreferences.h:
Video.h:
Inflater.h:
SizedArray.h:
Constants.h:
Messages/Message.h:
Messages/../Inflater.h:
Messages/../ProtocolPreferences.h:
Messages/../Constants.h:
Index.h:
IndexEntry.h:
Player.h:
Audio.h:
build/Debug/GNU-Linux-x86/CursorMessage.o: CursorMessage.cpp \
CursorMessage.h Messages/Message.h Messages/../Inflater.h \
Messages/../SizedArray.h Messages/../ProtocolPreferences.h \
Messages/../Constants.h ColorConverter.h
CursorMessage.h:
Messages/Message.h:
Messages/../Inflater.h:
Messages/../SizedArray.h:
Messages/../ProtocolPreferences.h:
Messages/../Constants.h:
ColorConverter.h:
build/Debug/GNU-Linux-x86/DeleteAllAnnotation.o: DeleteAllAnnotation.cpp \
DeleteAllAnnotation.h Message.h Inflater.h SizedArray.h \
ProtocolPreferences.h Constants.h
DeleteAllAnnotation.h:
Message.h:
Inflater.h:
SizedArray.h:
ProtocolPreferences.h:
Constants.h:
build/Debug/GNU-Linux-x86/DeleteAnnotation.o: DeleteAnnotation.cpp \
DeleteAnnotation.h Message.h Inflater.h SizedArray.h \
ProtocolPreferences.h Constants.h
DeleteAnnotation.h:
Message.h:
Inflater.h:
SizedArray.h:
ProtocolPreferences.h:
Constants.h:
build/Debug/GNU-Linux-x86/Downloader.o: Downloader.cpp Downloader.h
Downloader.h:
build/Debug/GNU-Linux-x86/EmptyMessage.o: EmptyMessage.cpp EmptyMessage.h \
Message.h Inflater.h SizedArray.h ProtocolPreferences.h Constants.h
EmptyMessage.h:
Message.h:
Inflater.h:
SizedArray.h:
ProtocolPreferences.h:
Constants.h:
build/Debug/GNU-Linux-x86/HextileMessage.o: HextileMessage.cpp \
HextileMessage.h Inflater.h SizedArray.h Message.h ProtocolPreferences.h \
Constants.h ColorConverter.h
HextileMessage.h:
Inflater.h:
SizedArray.h:
Message.h:
ProtocolPreferences.h:
Constants.h:
ColorConverter.h:
build/Debug/GNU-Linux-x86/Index.o: Index.cpp Index.h IndexEntry.h \
SizedArray.h Inflater.h Constants.h Messages/Message.h \
Messages/../Inflater.h Messages/../ProtocolPreferences.h \
Messages/../Constants.h
Index.h:
IndexEntry.h:
SizedArray.h:
Inflater.h:
Constants.h:
Messages/Message.h:
Messages/../Inflater.h:
Messages/../ProtocolPreferences.h:
Messages/../Constants.h:
build/Debug/GNU-Linux-x86/IndexEntry.o: IndexEntry.cpp IndexEntry.h \
SizedArray.h ProtocolPreferences.h
IndexEntry.h:
SizedArray.h:
ProtocolPreferences.h:
build/Debug/GNU-Linux-x86/IndexExtension.o: IndexExtension.cpp \
IndexExtension.h IndexEntry.h Inflater.h SizedArray.h
IndexExtension.h:
IndexEntry.h:
Inflater.h:
SizedArray.h:
build/Debug/GNU-Linux-x86/Inflater.o: Inflater.cpp Inflater.h \
SizedArray.h Constants.h
Inflater.h:
SizedArray.h:
Constants.h:
build/Debug/GNU-Linux-x86/Message.o: Message.cpp Message.h Inflater.h \
SizedArray.h ProtocolPreferences.h Constants.h EmptyMessage.h \
HextileMessage.h ColorConverter.h WhiteboardMessage.h \
Messages/DeleteAllAnnotation.h Messages/../Message.h RawMessage.h \
DeleteAnnotation.h
Message.h:
Inflater.h:
SizedArray.h:
ProtocolPreferences.h:
Constants.h:
EmptyMessage.h:
HextileMessage.h:
ColorConverter.h:
WhiteboardMessage.h:
Messages/DeleteAllAnnotation.h:
Messages/../Message.h:
RawMessage.h:
DeleteAnnotation.h:
build/Debug/GNU-Linux-x86/Messages/Annotation.o: Messages/Annotation.cpp \
Messages/Annotation.h Messages/Message.h Messages/../Inflater.h \
Messages/../SizedArray.h Messages/../Constants.h \
Messages/../ProtocolPreferences.h Messages/../Constants.h \
Messages/../ColorConverter.h Messages/WhiteboardMessage.h \
Messages/../Player.h Messages/../AudioInterface.h Messages/../Audio.h \
Messages/../Video.h Messages/../Inflater.h \
Messages/../ProtocolPreferences.h Messages/../Messages/Message.h \
Messages/../Index.h Messages/../IndexEntry.h Messages/../Controls.h
Messages/Annotation.h:
Messages/Message.h:
Messages/../Inflater.h:
Messages/../SizedArray.h:
Messages/../Constants.h:
Messages/../ProtocolPreferences.h:
Messages/../Constants.h:
Messages/../ColorConverter.h:
Messages/WhiteboardMessage.h:
Messages/../Player.h:
Messages/../AudioInterface.h:
Messages/../Audio.h:
Messages/../Video.h:
Messages/../Inflater.h:
Messages/../ProtocolPreferences.h:
Messages/../Messages/Message.h:
Messages/../Index.h:
Messages/../IndexEntry.h:
Messages/../Controls.h:
build/Debug/GNU-Linux-x86/Messages/CursorMessage.o: \
Messages/CursorMessage.cpp Messages/CursorMessage.h Messages/Message.h \
Messages/../Inflater.h Messages/../SizedArray.h Messages/../Constants.h \
Messages/../ProtocolPreferences.h Messages/../Constants.h \
Messages/../ColorConverter.h
Messages/CursorMessage.h:
Messages/Message.h:
Messages/../Inflater.h:
Messages/../SizedArray.h:
Messages/../Constants.h:
Messages/../ProtocolPreferences.h:
Messages/../Constants.h:
Messages/../ColorConverter.h:
build/Debug/GNU-Linux-x86/Messages/CursorPositionMessage.o: \
Messages/CursorPositionMessage.cpp Messages/CursorPositionMessage.h \
Messages/Message.h Messages/../Inflater.h Messages/../SizedArray.h \
Messages/../Constants.h Messages/../ProtocolPreferences.h \
Messages/../Constants.h Messages/CursorMessage.h \
Messages/../ColorConverter.h
Messages/CursorPositionMessage.h:
Messages/Message.h:
Messages/../Inflater.h:
Messages/../SizedArray.h:
Messages/../Constants.h:
Messages/../ProtocolPreferences.h:
Messages/../Constants.h:
Messages/CursorMessage.h:
Messages/../ColorConverter.h:
build/Debug/GNU-Linux-x86/Messages/DeleteAllAnnotation.o: \
Messages/DeleteAllAnnotation.cpp Messages/DeleteAllAnnotation.h \
Messages/Annotation.h Messages/Message.h Messages/../Inflater.h \
Messages/../SizedArray.h Messages/../Constants.h \
Messages/../ProtocolPreferences.h Messages/../Constants.h \
Messages/../ColorConverter.h
Messages/DeleteAllAnnotation.h:
Messages/Annotation.h:
Messages/Message.h:
Messages/../Inflater.h:
Messages/../SizedArray.h:
Messages/../Constants.h:
Messages/../ProtocolPreferences.h:
Messages/../Constants.h:
Messages/../ColorConverter.h:
build/Debug/GNU-Linux-x86/Messages/DeleteAnnotation.o: \
Messages/DeleteAnnotation.cpp Messages/DeleteAnnotation.h \
Messages/Annotation.h Messages/Message.h Messages/../Inflater.h \
Messages/../SizedArray.h Messages/../Constants.h \
Messages/../ProtocolPreferences.h Messages/../Constants.h \
Messages/../ColorConverter.h
Messages/DeleteAnnotation.h:
Messages/Annotation.h:
Messages/Message.h:
Messages/../Inflater.h:
Messages/../SizedArray.h:
Messages/../Constants.h:
Messages/../ProtocolPreferences.h:
Messages/../Constants.h:
Messages/../ColorConverter.h:
build/Debug/GNU-Linux-x86/Messages/EmptyMessage.o: \
Messages/EmptyMessage.cpp Messages/EmptyMessage.h Messages/Message.h \
Messages/../Inflater.h Messages/../SizedArray.h Messages/../Constants.h \
Messages/../ProtocolPreferences.h Messages/../Constants.h
Messages/EmptyMessage.h:
Messages/Message.h:
Messages/../Inflater.h:
Messages/../SizedArray.h:
Messages/../Constants.h:
Messages/../ProtocolPreferences.h:
Messages/../Constants.h:
build/Debug/GNU-Linux-x86/Messages/FreehandAnnotation.o: \
Messages/FreehandAnnotation.cpp Messages/FreehandAnnotation.h \
Messages/Annotation.h Messages/Message.h Messages/../Inflater.h \
Messages/../SizedArray.h Messages/../Constants.h \
Messages/../ProtocolPreferences.h Messages/../Constants.h \
Messages/../ColorConverter.h
Messages/FreehandAnnotation.h:
Messages/Annotation.h:
Messages/Message.h:
Messages/../Inflater.h:
Messages/../SizedArray.h:
Messages/../Constants.h:
Messages/../ProtocolPreferences.h:
Messages/../Constants.h:
Messages/../ColorConverter.h:
build/Debug/GNU-Linux-x86/Messages/HextileMessage.o: \
Messages/HextileMessage.cpp Messages/HextileMessage.h \
Messages/../Inflater.h Messages/../SizedArray.h Messages/../Constants.h \
Messages/Message.h Messages/../ProtocolPreferences.h \
Messages/../Constants.h Messages/../SizedArray.h \
Messages/../ColorConverter.h
Messages/HextileMessage.h:
Messages/../Inflater.h:
Messages/../SizedArray.h:
Messages/../Constants.h:
Messages/Message.h:
Messages/../ProtocolPreferences.h:
Messages/../Constants.h:
Messages/../SizedArray.h:
Messages/../ColorConverter.h:
build/Debug/GNU-Linux-x86/Messages/HighlightAnnotation.o: \
Messages/HighlightAnnotation.cpp Messages/HighlightAnnotation.h \
Messages/Annotation.h Messages/Message.h Messages/../Inflater.h \
Messages/../SizedArray.h Messages/../Constants.h \
Messages/../ProtocolPreferences.h Messages/../Constants.h \
Messages/../ColorConverter.h
Messages/HighlightAnnotation.h:
Messages/Annotation.h:
Messages/Message.h:
Messages/../Inflater.h:
Messages/../SizedArray.h:
Messages/../Constants.h:
Messages/../ProtocolPreferences.h:
Messages/../Constants.h:
Messages/../ColorConverter.h:
build/Debug/GNU-Linux-x86/Messages/LineAnnotation.o: \
Messages/LineAnnotation.cpp Messages/LineAnnotation.h \
Messages/../ColorConverter.h Messages/Annotation.h Messages/Message.h \
Messages/../Inflater.h Messages/../SizedArray.h Messages/../Constants.h \
Messages/../ProtocolPreferences.h Messages/../Constants.h
Messages/LineAnnotation.h:
Messages/../ColorConverter.h:
Messages/Annotation.h:
Messages/Message.h:
Messages/../Inflater.h:
Messages/../SizedArray.h:
Messages/../Constants.h:
Messages/../ProtocolPreferences.h:
Messages/../Constants.h:
build/Debug/GNU-Linux-x86/Messages/Message.o: Messages/Message.cpp \
Messages/Message.h Messages/../Inflater.h Messages/../SizedArray.h \
Messages/../Constants.h Messages/../ProtocolPreferences.h \
Messages/../Constants.h Messages/HextileMessage.h \
Messages/../SizedArray.h Messages/../ColorConverter.h \
Messages/WhiteboardMessage.h Messages/Annotation.h Messages/../Player.h \
Messages/../AudioInterface.h Messages/../Audio.h Messages/../Video.h \
Messages/../Inflater.h Messages/../ProtocolPreferences.h \
Messages/../Messages/Message.h Messages/../Index.h \
Messages/../IndexEntry.h Messages/../Controls.h \
Messages/DeleteAllAnnotation.h Messages/RawMessage.h \
Messages/DeleteAnnotation.h Messages/RectangleAnnotation.h \
Messages/CursorMessage.h Messages/CursorPositionMessage.h \
Messages/LineAnnotation.h Messages/FreehandAnnotation.h \
Messages/HighlightAnnotation.h
Messages/Message.h:
Messages/../Inflater.h:
Messages/../SizedArray.h:
Messages/../Constants.h:
Messages/../ProtocolPreferences.h:
Messages/../Constants.h:
Messages/HextileMessage.h:
Messages/../SizedArray.h:
Messages/../ColorConverter.h:
Messages/WhiteboardMessage.h:
Messages/Annotation.h:
Messages/../Player.h:
Messages/../AudioInterface.h:
Messages/../Audio.h:
Messages/../Video.h:
Messages/../Inflater.h:
Messages/../ProtocolPreferences.h:
Messages/../Messages/Message.h:
Messages/../Index.h:
Messages/../IndexEntry.h:
Messages/../Controls.h:
Messages/DeleteAllAnnotation.h:
Messages/RawMessage.h:
Messages/DeleteAnnotation.h:
Messages/RectangleAnnotation.h:
Messages/CursorMessage.h:
Messages/CursorPositionMessage.h:
Messages/LineAnnotation.h:
Messages/FreehandAnnotation.h:
Messages/HighlightAnnotation.h:
build/Debug/GNU-Linux-x86/Messages/RawMessage.o: Messages/RawMessage.cpp \
Messages/RawMessage.h Messages/../Inflater.h Messages/../SizedArray.h \
Messages/../Constants.h Messages/Message.h \
Messages/../ProtocolPreferences.h Messages/../Constants.h \
Messages/../SizedArray.h Messages/../ColorConverter.h
Messages/RawMessage.h:
Messages/../Inflater.h:
Messages/../SizedArray.h:
Messages/../Constants.h:
Messages/Message.h:
Messages/../ProtocolPreferences.h:
Messages/../Constants.h:
Messages/../SizedArray.h:
Messages/../ColorConverter.h:
build/Debug/GNU-Linux-x86/Messages/RectangleAnnotation.o: \
Messages/RectangleAnnotation.cpp Messages/RectangleAnnotation.h \
Messages/../Inflater.h Messages/../SizedArray.h Messages/../Constants.h \
Messages/Annotation.h Messages/Message.h \
Messages/../ProtocolPreferences.h Messages/../Constants.h \
Messages/../ColorConverter.h
Messages/RectangleAnnotation.h:
Messages/../Inflater.h: