Depuración de errores, se agregan nuevas funcionalidades

arredgroup · May 19, 2016 · 42767f7 · 42767f7
1 parent 3e69cf4
commit 42767f7
Show file tree

Hide file tree

Showing 88 changed files with 551,434 additions and 29,385 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/MakeMac b/MakeMac
diff --git a/Makefile b/Makefile
@@ -1,2 +1,10 @@
-all:
-	g++ -o test main.cpp -O2 -L/usr/X11R6/lib -lm -lpthread -lX11
+OBJS=main.o
+BIN=simlit
+CXXFLAGS ?= -std=c++11 -O2 -lm -lpthread -I/usr/X11R6/include -L/usr/X11R6/lib -lX11 -Wall
+
+$(BIN): $(OBJS)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
+
+clean:
+	rm $(OBJS) $(BIN)
+
diff --git a/MakefileUX b/MakefileUX
@@ -0,0 +1,2 @@
+all:
+	g++ -o test main.cpp -O2 -L/usr/X11R6/lib -lm -lpthread -lX11 -std=c++11
diff --git a/arguments.h b/arguments.h
@@ -3,8 +3,8 @@
 #define IMAGE_NAME "-image-name" 
 #define WIDTH_BLOCK "-width-block" 
 #define HEIGHT_BLOCK "-height-block"
-#define FOLDER_RESULT "-folder-result"
-#define EXPORT_FILES "-export-files"
+#define FOLDER_RESULT "-folder"
+#define EXPORT_RESULT "-export-result"
 #define EXPORT_IMAGES "-export-images"
 #define SHOW_DATA_SCREEN "-show-data-screen"
 
@@ -13,9 +13,11 @@
 	#define TURNER_MIX "turner-mixer"
 	#define DSJAL_MIX "dsjal-mixer"
 	#define FILE_MIX "file-mixer"
+	#define JPG "jpg-compressor"
 
 #define PACKETIZER_METHOD "-packetizer-method"
-	#define NORMAL_PAKETIZER "normal-packetizer" 
+	#define NORMAL_PACKETIZER "normal-packetizer" 
+	#define FILE_PACKETIZER "file-packetizer" 
 
 #define CHANNEL_METHOD "-channel-method"
 	#define LOST_FROM_FILE "lost-from-file"

diff --git a/class/.DS_Store b/class/.DS_Store
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		all:
		g++ -o test main.cpp -O2 -L/usr/X11R6/lib -lm -lpthread -lX11 -std=c++11