Skip to content
Snippets Groups Projects
Commit 0efbbce5 authored by Fabio Di Francesco's avatar Fabio Di Francesco
Browse files

gigalomania moved to patched repository

parent 53915515
No related branches found
No related tags found
1 merge request!192gigalomania moved to patched repository
--- source/Makefile 2018-05-28 10:13:03.737049078 +0200
+++ build/Makefile 2018-05-28 11:23:29.808994973 +0200
@@ -1,13 +1,14 @@
-CC=g++
+CC=$(CPPHOST)
CCFLAGS=-O2 -Wall
CFILES=game.cpp gamestate.cpp gui.cpp image.cpp main.cpp panel.cpp player.cpp resources.cpp screen.cpp sector.cpp sound.cpp tutorial.cpp utils.cpp TinyXML/tinyxml.cpp TinyXML/tinyxmlerror.cpp TinyXML/tinyxmlparser.cpp
HFILES=game.h gamestate.h gui.h image.h panel.h player.h resources.h screen.h sector.h sound.h tutorial.h utils.h common.h stdafx.h TinyXML/tinyxml.h
OFILES=game.o gamestate.o gui.o image.o panel.o player.o resources.o screen.o sector.o sound.o tutorial.o utils.o main.o TinyXML/tinyxml.o TinyXML/tinyxmlerror.o TinyXML/tinyxmlparser.o
APP=gigalomania
-INC=`sdl2-config --cflags`
-LINKPATH=`sdl2-config --libs` -L/usr/X11R6/lib/ -L/usr/lib
+INC=$(CPPFLAGS)
+LINKPATH=$(LDFLAGS)
+GAMEPATH="/games/gigalomania"
-LIBS=-lSDL2_image -lSDL2_mixer
+LIBS=-lSDL_mixer -lSDL_image -ljpeg -lpng -lSDL -lorbital -lz
all: $(APP)
@@ -19,69 +20,16 @@
# REMEMBER to update debian/dirs if the system directories that we use are changed!!!
install: $(APP)
- mkdir -p $(DESTDIR)/opt/gigalomania # -p so we don't fail if folder already exists
- cp $(APP) $(DESTDIR)/opt/gigalomania
- cp readme.html $(DESTDIR)/opt/gigalomania
- cp -a gfx/ $(DESTDIR)/opt/gigalomania # -a need to copy permissions etc
- cp -a islands/ $(DESTDIR)/opt/gigalomania
- cp -a music/ $(DESTDIR)/opt/gigalomania
- cp -a sound/ $(DESTDIR)/opt/gigalomania
- # needed for DESTDIR option:
- mkdir -p $(DESTDIR)/usr/share/applications
- cp gigalomania.desktop $(DESTDIR)/usr/share/applications/
- #cp gigalomania_fullscreen.desktop $(DESTDIR)/usr/share/applications/
- # needed for DESTDIR option:
- mkdir -p $(DESTDIR)/usr/share/pixmaps
- cp gigalomania64.png $(DESTDIR)/usr/share/pixmaps/
-# REMEMBER to update debian/dirs if the system directories that we use are changed!!!
+ mkdir -p $(DESTDIR)$(GAMEPATH) # -p so we don't fail if folder already exists
+ cp $(APP) $(DESTDIR)$(GAMEPATH)
+ cp readme.html $(DESTDIR)$(GAMEPATH)
+ cp -a gfx/ $(DESTDIR)$(GAMEPATH)
+ cp -a islands/ $(DESTDIR)$(GAMEPATH)
+ cp -a music/ $(DESTDIR)$(GAMEPATH)
+ cp -a sound/ $(DESTDIR)$(GAMEPATH)
uninstall:
- rm -rf $(DESTDIR)/opt/gigalomania # -f so we don't fail if folder doesn't exist
- rm -f $(DESTDIR)/usr/share/applications/gigalomania.desktop
- #rm -f $(DESTDIR)/usr/share/applications/gigalomania_fullscreen.desktop
- rm -f $(DESTDIR)/usr/share/pixmaps/gigalomania64.png
-
-install_maemo: $(APP)
- mkdir -p $(DESTDIR)/opt/gigalomania # -p so we don't fail if folder already exists
- cp $(APP) $(DESTDIR)/opt/gigalomania
- cp -a gfx/ $(DESTDIR)/opt/gigalomania # -a need to copy permissions etc
- cp -a islands/ $(DESTDIR)/opt/gigalomania
- cp -a music/ $(DESTDIR)/opt/gigalomania
- cp -a sound/ $(DESTDIR)/opt/gigalomania
- mkdir -p $(DESTDIR)/usr/share/applications/hildon/
- cp gigalomania_maemo.desktop $(DESTDIR)/usr/share/applications/hildon/
- mkdir -p $(DESTDIR)/usr/share/pixmaps
- cp gigalomania48.png $(DESTDIR)/usr/share/pixmaps/
- chmod a+x gigalomania_mobile.sh # workaround for permissions not set in zip file!
- mkdir -p $(DESTDIR)/usr/bin/
- cp gigalomania_mobile.sh $(DESTDIR)/usr/bin/gigalomania_mobile.sh
-
-uninstall_maemo:
- rm -rf $(DESTDIR)/opt/gigalomania # -f so we don't fail if folder doesn't exist
- rm -f $(DESTDIR)/usr/share/applications/hildon/gigalomania_maemo.desktop
- rm -f $(DESTDIR)/usr/share/pixmaps/gigalomania48.png
- rm -f $(DESTDIR)/usr/bin/gigalomania_mobile.sh
-
-install_meego: $(APP)
- mkdir -p $(DESTDIR)/opt/gigalomania # -p so we don't fail if folder already exists
- cp $(APP) $(DESTDIR)/opt/gigalomania
- cp -a gfx/ $(DESTDIR)/opt/gigalomania # -a need to copy permissions etc
- cp -a islands/ $(DESTDIR)/opt/gigalomania
- cp -a music/ $(DESTDIR)/opt/gigalomania
- cp -a sound/ $(DESTDIR)/opt/gigalomania
- mkdir -p $(DESTDIR)/usr/share/applications
- cp gigalomania_maemo.desktop $(DESTDIR)/usr/share/applications/
- mkdir -p $(DESTDIR)/usr/share/icons/hicolor/48x48/apps/
- cp gigalomania48.png $(DESTDIR)/usr/share/icons/hicolor/48x48/apps/
- chmod a+x gigalomania_mobile.sh # workaround for permissions not set in zip file!
- mkdir -p $(DESTDIR)/usr/bin/
- cp gigalomania_mobile.sh $(DESTDIR)/usr/bin/gigalomania_mobile.sh
-
-uninstall_meego:
- rm -rf $(DESTDIR)/opt/gigalomania # -f so we don't fail if folder doesn't exist
- rm -f $(DESTDIR)/usr/share/applications/gigalomania_maemo.desktop
- rm -f $(DESTDIR)/usr/share/icons/hicolor/48x48/apps/gigalomania48.png
- rm -f $(DESTDIR)/usr/bin/gigalomania_mobile.sh
+ rm -rf $(DESTDIR)$(GAMEPATH)
clean:
rm -rf *.o
--- source/stdafx.h 2018-06-17 18:09:41.729534046 +0200
+++ build/stdafx.h 2018-06-17 18:18:54.353160159 +0200
@@ -20,5 +20,5 @@
#elif defined(__MORPHOS__)
#include <SDL/SDL.h>
#else
-#include <sdl.h>
+#include <SDL/SDL.h>
#endif
--- source/image.h 2018-06-17 18:09:41.601543849 +0200
+++ build/image.h 2018-06-17 18:23:39.379455831 +0200
@@ -14,7 +14,7 @@
#elif defined(__MORPHOS__)
#include <SDL/SDL_image.h>
#else
-#include <SDL_image.h>
+#include <SDL/SDL_image.h>
#endif
const int font_index_period_c = 26;
--- source/sound.h 2018-06-17 18:09:41.681537723 +0200
+++ build/sound.h 2018-06-17 18:34:51.659424313 +0200
@@ -13,7 +13,7 @@
#elif defined(__linux)
#include <SDL2/SDL_mixer.h>
#else
-#include <SDL_mixer.h>
+#include <SDL/SDL_mixer.h>
#endif
bool initSound();
--- source/game.h 2018-06-17 18:09:41.545548138 +0200
+++ build/game.h 2018-06-17 18:26:27.573161256 +0200
@@ -530,7 +530,7 @@
void startNewGame_g();
// DATADIR is place to look if data not present in application's folder
-//#define DATADIR "C:/temp/glmdata" // test on Windows
+#define DATADIR "/games/gigalomania" // test on Windows
extern string maps_dirname;
#ifdef DATADIR
--- source/game.cpp 2018-06-17 18:09:41.545548000 +0200
+++ build/game.cpp 2018-06-17 20:06:47.516838000 +0200
@@ -2900,8 +2900,8 @@
#if SDL_MAJOR_VERSION == 1
const SDL_VideoInfo *videoInfo = SDL_GetVideoInfo();
- *user_width = videoInfo->current_w;
- *user_height = videoInfo->current_h;
+ *user_width = 640;//videoInfo->current_w;
+ *user_height = 480;//videoInfo->current_h;
LOG("desktop is %d x %d\n", *user_width, *user_height);
#else
SDL_DisplayMode displayMode;
@@ -2942,11 +2942,11 @@
//user_width = 1184;
//user_height = 720;
- if( user_width >= 4*default_width_c ) {
+ /*if( user_width >= 4*default_width_c ) {
scale_width = 4.0f;
LOG("scale width 4x\n");
}
- else if( user_width >= 3*default_width_c ) {
+ else*/ if( user_width >= 3*default_width_c ) {
scale_width = 3.0f;
LOG("scale width 3x\n");
}
@@ -2963,11 +2963,11 @@
return false;
}
- if( user_height >= 4*default_height_c ) {
+ /*if( user_height >= 4*default_height_c ) {
scale_height = 4.0f;
LOG("scale height 4x\n");
}
- else if( user_height >= 3*default_height_c ) {
+ else*/ if( user_height >= 3*default_height_c ) {
scale_height = 3.0f;
LOG("scale height 3x\n");
}
@@ -3022,11 +3022,11 @@
screen = new Gigalomania::Screen();
#if SDL_MAJOR_VERSION == 1
- if( screen->open(4*default_width_c, 4*default_height_c, fullscreen) ) {
+ /*if( screen->open(4*default_width_c, 4*default_height_c, fullscreen) ) {
scale_width = scale_height = 4.0f;
LOG("scale 4x\n");
}
- else if( screen->open(3*default_width_c, 3*default_height_c, fullscreen) ) {
+ else*/ if( screen->open(3*default_width_c, 3*default_height_c, fullscreen) ) {
scale_width = scale_height = 3.0f;
LOG("scale 3x\n");
}
@@ -3636,7 +3636,7 @@
}
//bool quit = false;
-bool debugwindow = false;
+bool debugwindow = true;
void Game::requestQuit(bool force_quit) {
if( !state_changed ) {
@@ -5243,7 +5243,7 @@
debugwindow = true;
#endif
- bool fullscreen = true;
+ bool fullscreen = false;
#if defined(__amigaos4__) || defined(AROS) || defined(__MORPHOS__)
fullscreen = false; // run in windowed mode due to reported performance problems in fullscreen mode on AmigaOS 4; also randomly hangs on AROS in fullscreen mode; also included MorphOS just to be safe
#endif
--- source/gamestate.cpp 2018-06-17 18:09:41.549547831 +0200
+++ build/gamestate.cpp 2018-06-17 18:31:22.793844378 +0200
@@ -1429,7 +1429,7 @@
void GameState::fadeScreen(bool out, int delay, void (*func_finish)()) {
if( fade != NULL )
- delete fade;
+ { delete fade; }
if( game_g->isTesting() ) {
if( func_finish != NULL ) {
func_finish();
@@ -1443,7 +1443,7 @@
void GameState::whiteFlash() {
//ASSERT( whitefade == NULL );
if( whitefade != NULL )
- delete whitefade;
+ { delete whitefade; }
if( !game_g->isTesting() ) {
whitefade = new FadeEffect(true, false, 0, NULL);
}
VERSION=0.27
GIT=https://git.code.sf.net/p/gigalomania/code
GIT=https://github.com/fabiao/gigalomania
BRANCH=master
BUILD_DEPENDS=(sdl_mixer sdl_image sdl liborbital libpng libjpeg zlib)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment