Ticket #540: frogatto-1.1.1.0.patch

Makefile.haiku

@@ +1 @@
+CC  = ccache gcc
+CXX = ccache g++
+
+OPT = -O2 -fno-inline-functions
+
+objects = IMG_savepng.o achievements.o background.o blur.o border_widget.o button.o character_editor_dialog.o checkbox.o current_generator.o decimal.o editor_dialogs.o editor_formula_functions.o editor_layers_dialog.o editor_stats_dialog.o editor_variable_info.o collision_utils.o color_utils.o controls.o controls_dialog.o custom_object.o custom_object_callable.o custom_object_functions.o custom_object_type.o debug_console.o dialog.o draw_number.o draw_scene.o draw_tile.o editor.o editor_level_properties_dialog.o entity.o filesystem.o font.o formula.o formula_callable_definition.o formula_constants.o formula_function.o formula_profiler.o formula_tokenizer.o formula_variable_storage.o frame.o framed_gui_element.o game_registry.o geometry.o globals.o graphical_font.o graphical_font_label.o grid_widget.o group_property_editor_dialog.o gui_formula_functions.o gui_section.o i18n.o image_widget.o input.o inventory.o iphone_controls.o joystick.o key.o key_button.o label.o level.o level_logic.o level_object.o level_runner.o level_solid_map.o light.o load_level.o main.o message_dialog.o movement_script.o multi_tile_pattern.o multiplayer.o object_events.o options_dialog.o package.o particle_system.o pause_game_dialog.o playable_custom_object.o player_info.o powerup.o preferences.o preprocessor.o preview_tileset_widget.o property_editor_dialog.o random.o raster.o raster_distortion.o rectangle_rotator.o scrollbar_widget.o scrollable_widget.o segment_editor_dialog.o settings_dialog.o slider.o solid_map.o sound.o speech_dialog.o stats.o string_utils.o surface_cache.o surface_formula.o surface_palette.o surface_scaling.o surface.o texture.o texture_frame_buffer.o text_entry_widget.o thread.o tile_map.o tileset_editor_dialog.o tooltip.o translate.o utils.o variant.o water.o water_particle_system.o weather_particle_system.o widget.o wml_formula_adapter.o wml_formula_callable.o wml_modify.o wml_node.o wml_parser.o wml_schema.o wml_utils.o wml_writer.o unit_test.o formula_test.o wml_parser_test.o loading_screen.o utility_object_compiler.o utility_object_editor.o
+
+server_objects = server.o simple_wml.o
+
+formula_test_objects = filesystem.o formula_function.o formula_tokenizer.o string_utils.o variant.o wml_node.o wml_parser.o wml_utils.o wml_writer.o
+
+wml_modify_test_objects = filesystem.o string_utils.o wml_node.o wml_parser.o wml_utils.o
+wml_schema_test_objects = filesystem.o string_utils.o wml_node.o wml_parser.o wml_utils.o
+
+%.o : src/%.cpp
+        $(CXX) -DIMPLEMENT_SAVE_PNG -DSDL_VIDEO_OPENGL_ES -fno-inline-functions -g $(OPT) `sdl-config --cflags` -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Wreturn-type -fthreadsafe-statics -c $<
+
+game: $(objects)
+        $(CXX) -g $(OPT) -L. -L/boot/common/lib -L. -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Wreturn-type -L/boot/common/lib `sdl-config --libs` -lSDLmain -lSDL -lGL -lGLU -lSDL_image -lSDL_ttf -lSDL_mixer -lpng -lboost_regex -lboost_system -lnetwork -fthreadsafe-statics $(objects) -o game
+
+server: $(server_objects)
+        $(CXX) -fno-inline-functions -g $(OPT) -L/boot/common/lib -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Wreturn-type -L/boot/common/lib `sdl-config --libs` -lSDLmain -lSDL -lGL -lGLU -lSDL_image -lSDL_ttf -lSDL_mixer -lboost_regex -lboost_system -lboost_thread -lboost_iostreams -lnetwork -fthreadsafe-statics $(server_objects) -o server
+
+poolalloc.o: src/poolalloc.c
+        $(CC) -fno-inline-functions -g $(OPT) `sdl-config --cflags` -D_GNU_SOURCE=1 -D_REENTRANT -Wreturn-type -c src/poolalloc.c
+
+malloc.o: src/malloc.c
+        $(CC) -fno-inline-functions -g $(OPT) `sdl-config --cflags` -D_GNU_SOURCE=1 -D_REENTRANT -DUSE_LOCKS=1 -Wreturn-type -c src/malloc.c
+
+formula_test: $(formula_test_objects)
+        $(CXX) -O2 -g -I/boot/common/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -DUNIT_TEST_FORMULA -Wnon-virtual-dtor -Wreturn-type -L/boot/common/lib -lSDL -lGL -lGLU -lSDL_image -lSDL_ttf -lSDL_mixer -lboost_regex src/formula.cpp $(formula_test_objects) -o test
+
+wml_modify_test: $(wml_modify_test_objects)
+        $(CXX) -O2 -g -framework Cocoa -I/boot/common/include/boost-1_34 -I/boot/common/include/SDL -Isrc/ -I/boot/common/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -DUNIT_TEST_WML_MODIFY -Wnon-virtual-dtor -Wreturn-type -L/boot/common/lib -lboost_regex src/wml_modify.cpp $(wml_modify_test_objects) -o test
+
+wml_schema_test: $(wml_schema_test_objects)
+        $(CXX) -O2 -g -framework Cocoa -I/boot/common/include/boost-1_34 -I/boot/common/include/SDL -Isrc/ -I/boot/common/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -DUNIT_TEST_WML_SCHEMA -Wnon-virtual-dtor -Wreturn-type -L/boot/common/lib -lboost_regex src/wml_schema.cpp $(wml_schema_test_objects) -o test
+
+update-pot:
+        utils/make-pot.sh > po/frogatto.pot
+
+%.po: po/frogatto.pot
+        msgmerge $@ po/frogatto.pot -o $@.part
+        mv $@.part $@
+
+LINGUAS=de el eo es fr it pl pt_BR ru sk zh_CN ja
+
+update-po:
+        (for lang in ${LINGUAS}; do \
+                ${MAKE} po/$$lang.po ; \
+        done)
+
+update-mo:
+        (for lang in ${LINGUAS}; do \
+                mkdir -p locale/$$lang/LC_MESSAGES ; \
+                msgfmt po/$$lang.po -o locale/$$lang/LC_MESSAGES/frogatto.mo ; \
+        done)
+
+clean:
+        rm -f *.o game

src/raster.cpp

@@ -77 +77 @@
         }
         
 #ifdef SDL_VIDEO_OPENGL_ES
-#define glOrtho glOrthof
+#define glOrtho glOrtho
 #endif
         
         void prepare_raster()

src/texture_frame_buffer.cpp

@@ -3 +3 @@
 #include <GL/glew.h>
 #endif
 
+#define GL_GLEXT_PROTOTYPES
+
 #include "asserts.hpp"
 #include "preferences.hpp"
 #include "texture.hpp"
@@ -60 +62 @@
                 supported = false;
                 return;
         }
-#elif !TARGET_OS_IPHONE && !TARGET_IPHONE_SIMULATOR
+#elif !TARGET_OS_IPHONE && !TARGET_IPHONE_SIMULATOR && !defined(__HAIKU__)
         if(!GLEW_EXT_framebuffer_object)
     {
                 fprintf(stderr, "FRAME BUFFER OBJECT NOT SUPPORTED\n");

src/water.cpp

@@ -176 +176 @@
                 glBlendEquationOES(GL_FUNC_REVERSE_SUBTRACT_OES);
         #elif defined(GL_OES_blend_subtract)
         glBlendEquationOES(GL_FUNC_REVERSE_SUBTRACT_OES);
-        #else
+        #elif !defined(__HAIKU__)
         if(GLEW_EXT_blend_equation_separate && (GLEW_ARB_imaging || GLEW_VERSION_1_4)) {
                 glBlendEquation(GL_FUNC_REVERSE_SUBTRACT);
         } else {
@@ -207 +207 @@
                 glBlendEquationOES(GL_FUNC_ADD_OES);
         #elif defined(GL_OES_blend_subtract)
         glBlendEquationOES(GL_FUNC_ADD_OES);
-        #else
+        #elif !defined(__HAIKU__)
         if (GLEW_EXT_blend_equation_separate && (GLEW_ARB_imaging || GLEW_VERSION_1_4))
                 glBlendEquation(GL_FUNC_ADD);
         #endif