From a867e763d49475fcb7e200aaaaca08fa37fe5d34 Mon Sep 17 00:00:00 2001
From: Bach Nguyen <bach5000@gmail.com>
Date: Wed, 21 Nov 2018 15:36:08 +0000
Subject: Fix build x86_64


diff --git a/source/Makefile b/source/Makefile
index 6b07fc3..3d9aaa7 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -1,4 +1,4 @@
-## Haiku Generic Makefile v2.6 ##
+## Haiku Generic Makefile ##
 
 ## Fill in this file to specify the project being created, and the referenced
 ## Makefile-Engine will do all of the hard work for you. This handles any
@@ -15,7 +15,7 @@ NAME = Animator
 TYPE = APP
 
 # 	If you plan to use localization, specify the application's MIME signature.
-APP_MIME_SIG = 
+APP_MIME_SIG = application/x-gjvr-Animator
 
 #	The following lines tell Pe and Eddie where the SRCS, RDEFS, and RSRCS are
 #	so that Pe and Eddie can fill them in for you.
@@ -28,19 +28,15 @@ APP_MIME_SIG =
 #	means this Makefile will not work correctly if two source files with the
 #	same name (source.c or source.cpp) are included from different directories.
 #	Also note that spaces in folder names do not work well with this Makefile.
-SRCS =  \
-	main.cpp \
-	fenetre.cpp \
-	mainview.cpp \
-	about.cpp
+SRCS = main.cpp mainview.cpp fenetre.cpp about.cpp
 
 #	Specify the resource definition files to use. Full or relative paths can be
 #	used.
-RDEFS =
+RDEFS = animator.rdef
 
 #	Specify the resource files to use. Full or relative paths can be used.
 #	Both RDEFS and RSRCS can be utilized in the same Makefile.
-RSRCS = animator.rsrc
+RSRCS =
 
 # End Pe/Eddie support.
 # @<-src@ 
@@ -58,7 +54,7 @@ RSRCS = animator.rsrc
 #	- 	if your library does not follow the standard library naming scheme,
 #		you need to specify the path to the library and it's name.
 #		(e.g. for mylib.a, specify "mylib.a" or "path/mylib.a")
-LIBS =  be translation
+LIBS = $(STDCPPLIBS) be translation
 
 #	Specify additional paths to directories following the standard libXXX.so
 #	or libXXX.a naming scheme. You can specify full paths or paths relative
@@ -70,7 +66,7 @@ LIBPATHS =
 #	Additional paths to look for system headers. These use the form
 #	"#include <header>". Directories that contain the files in SRCS are
 #	NOT auto-included here.
-SYSTEM_INCLUDE_PATHS =
+SYSTEM_INCLUDE_PATHS = 
 
 #	Additional paths paths to look for local headers. These use the form
 #	#include "header". Directories that contain the files in SRCS are
@@ -79,7 +75,7 @@ LOCAL_INCLUDE_PATHS =
 
 #	Specify the level of optimization that you want. Specify either NONE (O0),
 #	SOME (O1), FULL (O2), or leave blank (for the default optimization level).
-OPTIMIZE := FULL
+OPTIMIZE :=
 
 # 	Specify the codes for languages you are going to support in this
 # 	application. The default "en" one must be provided too. "make catkeys"
@@ -108,7 +104,7 @@ SYMBOLS :=
 DEBUGGER := 
 
 #	Specify any additional compiler flags to be used.
-COMPILER_FLAGS =
+COMPILER_FLAGS = 
 
 #	Specify any additional linker flags to be used.
 LINKER_FLAGS = 
diff --git a/source/animator.rdef b/source/animator.rdef
new file mode 100644
index 0000000..5c16bde
--- /dev/null
+++ b/source/animator.rdef
@@ -0,0 +1,69 @@
+
+resource app_signature "application/x-vnd.Animator";
+
+resource file_types message;
+
+resource app_version {
+	major  = 0,
+	middle = 0,
+	minor  = 0,
+
+	variety = B_APPV_DEVELOPMENT,
+	internal = 0
+};
+
+resource large_icon array {
+	$"FFFFFFFFFFFFFFFFFFFFFFFF0000000000000000FFFFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFF000000FAFAFAFAFAFAFAFA000000FFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFF0000FAFAFAFAFAFAFAFAFAFAFAFAFAFA0000FFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFF00FAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFA00FFFFFFFFFFFF"
+	$"FFFFFFFFFF00FAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFA00FFFFFFFFFF"
+	$"FFFFFFFF00FAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFA00FFFFFFFF"
+	$"FFFFFF00FAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFA00FFFFFF"
+	$"FFFF00FAFAFAFAFAFA000000FAFAFAFAFA000000FAFAFAFAFAFAFAFAFA00FFFF"
+	$"FFFF00FAFAFAFAFA0000000000FAFAFA0000000000FAFAFAFAFAFAFAFA00FFFF"
+	$"FF00FAFAFAFAFAFA0000000000FAFAFA0000000000FAFAFAFAFAFAFAFAFA00FF"
+	$"FF00FAFAFAFAFAFA0000000000FAFAFA0000000000FAFAFAFAFAFAFAFAFA00FF"
+	$"FF00FAFAFAFAFAFAFA000000FAFAFAFAFA000000FAFAFAFAFAFAFAFAFAFA00FF"
+	$"00FAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFA00"
+	$"00FAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFA00"
+	$"00FAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFA00"
+	$"00FAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFA00"
+	$"00FAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFA00"
+	$"00FAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFA00"
+	$"00FAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFA00"
+	$"00FAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFA00"
+	$"FF00FAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFA00FF"
+	$"FF00FAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFA00FF"
+	$"FF00FAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFA00FF"
+	$"FFFF00FAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFA00FFFF"
+	$"FFFF00FAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFA00FFFF"
+	$"FFFFFF00FAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFA00FFFFFF"
+	$"FFFFFFFF00FAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFA00FFFFFFFF"
+	$"FFFFFFFFFF00FAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFA00FFFFFFFFFF"
+	$"FFFFFFFFFFFF00FAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFA00FFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFF0000FAFAFAFAFAFAFAFAFAFAFAFAFAFA0000FFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFF000000FAFAFAFAFAFAFAFA000000FFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFFFFFF0000000000000000FFFFFFFFFFFFFFFFFFFFFFFF"
+};
+
+resource mini_icon array {
+	$"FFFFFFFFFF000000000000FFFFFFFFFF"
+	$"FFFFFF0000FAFAFAFAFAFA0000FFFFFF"
+	$"FFFF00FAFAFAFAFAFAFAFAFAFA00FFFF"
+	$"FF00FAFA000000FA000000FAFAFA00FF"
+	$"FF00FAFA000000FA000000FAFAFA00FF"
+	$"00FAFAFA000000FA000000FAFAFAFA00"
+	$"00FAFAFAFAFAFAFAFAFAFAFAFAFAFA00"
+	$"00FAFAFAFAFAFAFAFAFAFAFAFAFAFA00"
+	$"00FAFAFAFAFAFAFAFAFAFAFAFAFAFA00"
+	$"00FAFAFAFAFAFAFAFAFAFAFAFAFAFA00"
+	$"00FAFAFAFAFAFAFAFAFAFAFAFAFAFA00"
+	$"FF00FAFAFAFAFAFAFAFAFAFAFAFA00FF"
+	$"FF00FAFAFAFAFAFAFAFAFAFAFAFA00FF"
+	$"FFFF00FAFAFAFAFAFAFAFAFAFA00FFFF"
+	$"FFFFFF0000FAFAFAFAFAFA0000FFFFFF"
+	$"FFFFFFFFFF000000000000FFFFFFFFFF"
+};
+
+resource app_flags B_SINGLE_LAUNCH;
diff --git a/source/mainview.h b/source/mainview.h
index a90605d..683ba83 100644
--- a/source/mainview.h
+++ b/source/mainview.h
@@ -9,13 +9,13 @@
 #include <list>
 #include <OS.h>
 
-typedef list<BBitmap*>::iterator ITER;
+typedef std::list<BBitmap*>::iterator ITER;
 
 class MainView : public BView
 {
 	BBitmap* CurrentBitmap; //bitmap courrant
 	BView* offscreenView; //view pour dessiner offscreen
-	list<BBitmap*> file; //tous les bitmaps
+	std::list<BBitmap*> file; //tous les bitmaps
 	ITER runner;
 	int Speed;
 	int Loop;
@@ -34,4 +34,4 @@ class MainView : public BView
 	void Animate();
 };
 
-#endif
\ No newline at end of file
+#endif
-- 
2.19.0

