Snow leopard Compatibility Fixes

.gitmodules

@@ -1,6 +1,7 @@
 [submodule "submodules/libgme_m"]
 	path = submodules/libgme_m
 	url = https://github.com/bazzinotti/libgme_m.git
+	branch = experimental
 [submodule "submodules/wla-dx"]
 	path = submodules/wla-dx
 	url = https://github.com/bazzinotti/wla-dx.git

pc/Makefile

@@ -23,9 +23,16 @@ SHARED_DIR = shared/
 PROJ_DIR = ext
 #
 
-CC=$(CROSS_COMPILE)g++
-CPP=$(CROSS_COMPILE)g++
-OBJCC=$(CROSS_COMPILE)g++
+# Only Set compilers if they are unset (default). This lets you set them from the environment manually.
+ifeq ($(origin CC),default)
+	CC = $(CROSS_COMPILE)g++
+endif
+ifeq ($(origin CPP),default)
+	CPP = $(CROSS_COMPILE)g++
+endif
+# OBJCC is not a Make default variable so use this syntax instead
+OBJCC ?= $(CROSS_COMPILE)g++
+
 debug = -g
 optimize = -O3
 
@@ -259,12 +266,12 @@ $(BIN)/$(DEC7Z): $(PROJ_DIR)/lzma1505/C/Util/7z/$(DEC7Z) $(PROJ_DIR)/lzma1505/C/
 	cp $(PROJ_DIR)/lzma1505/C/Util/7z/$(DEC7Z) $(BIN)
 
 $(PROJ_DIR)/lzma1505/C/Util/7z/$(DEC7Z):
-	uname_S=$(uname_S) make -C $(PROJ_DIR)/lzma1505/C/Util/7z -f makefile.gcc
+	uname_S=$(uname_S) LDFLAGS= CFLAGS= make -C $(PROJ_DIR)/lzma1505/C/Util/7z -f makefile.gcc
 
 $(BIN)/$(UNRAR): $(PROJ_DIR)/unrar/$(UNRAR)
 	cp $(PROJ_DIR)/unrar/$(UNRAR) $(BIN)
 $(PROJ_DIR)/unrar/$(UNRAR):
-	uname_S=$(uname_S) make -C $(PROJ_DIR)/unrar
+	uname_S=$(uname_S) CPPFLAGS= LDFLAGS= make -C $(PROJ_DIR)/unrar
 
 $(LIBJDKMIDI_LIB): $(LIBJDKMIDI_OSDIR)/Makefile
 	cd $(LIBJDKMIDI_OSDIR) && make

pc/debugger/BrrContextMenu.cpp

@@ -116,7 +116,7 @@ uint16_t get_voice_srcn_addr(uint8_t voice)
 int BrrContextMenu::write_brr_to_file_callback(void *data)
 {
 	uintptr_t brr_addr = (uintptr_t) data;
-	write_brr_to_file( (Brr *) &::IAPURAM[brr_addr]);
+	return write_brr_to_file( (Brr *) &::IAPURAM[brr_addr]);
 }
 
 int BrrContextMenu::write_sti_to_file_callback(void *data)
@@ -146,6 +146,7 @@ int BrrContextMenu::write_sti_to_file_callback(void *data)
 	}
 
 	sample.brr = NULL; // stop destructor from freeing that mem
+	return 0;
 }
 
 #include "BaseD.h"

pc/debugger/Menu_Bar.cpp

@@ -374,10 +374,12 @@ int Menu_Bar::About_Context::clicked_patreon(void *nada)
 {
   DEBUGLOG("CLICKED PATREON\n");
   openUrl(PATREON_URL);
+  return 0;
 }
 
 int Menu_Bar::About_Context::clicked_merch(void *nada)
 {
   DEBUGLOG("CLICKED MERCH\n");
   openUrl(MERCH_URL);
+  return 0;
 }

pc/debugger/content_areas/Dsp_Window.cpp

@@ -764,7 +764,7 @@ int Dsp_Window::receive_event(SDL_Event &ev)
     {
       default:break;
     }
-    return;
+    return 0;
   }
 
   dblclick::check_event(&ev);
@@ -1276,12 +1276,12 @@ int Dsp_Window::receive_event(SDL_Event &ev)
     case SDL_MOUSEBUTTONDOWN:           
       {
         if (screw_clickable.check_mouse_and_execute(ev.button.x, ev.button.y))
-          return;
+          return 0;
         for (int i=0; i < NUM_TIMERS; i++)
         {
           timers.num = i;
           if (timers.label[i].check_mouse_and_execute(ev.button.x, ev.button.y))
-            return;
+            return 0;
         }
 				/* NOTE: Add code here to check for clicks over DIR entries */
         for (int i=0; i < NUM_DIR_ENTRIES_DISPLAYED; i++)
@@ -1291,7 +1291,7 @@ int Dsp_Window::receive_event(SDL_Event &ev)
 					      dir_rects[i].check_mouse_and_execute(ev.button.x, ev.button.y) ) ||
 					     ( ev.button.button == SDL_BUTTON_LEFT &&
 					      loop_clickable[i].clickable_text.check_mouse_and_execute(ev.button.x, ev.button.y)) )
-            return;
+            return 0;
         }
         for (int i=0; i < MAX_VOICES; i++)
         {
@@ -1305,6 +1305,7 @@ int Dsp_Window::receive_event(SDL_Event &ev)
       default:
       break;
   }
+  return 0;
 }
 
 int Dsp_Window::dir_rect_clicked(void *idx)
@@ -1327,4 +1328,5 @@ int Dsp_Window::dir_rect_clicked(void *idx)
 
 	::brrcontext.menu.preload(mouse::x, mouse::y);
 	::brrcontext.menu.activate();
+	return 0;
 }

pc/debugger/content_areas/Instrument_Window.cpp

@@ -550,6 +550,7 @@ int Instrument_Window::receive_event(SDL_Event &ev)
     default:
     break;
   }
+  return 0;
 }
 
 void Instrument_Window::set_voice(unsigned char v)

pc/debugger/content_areas/Main_Window.cpp

@@ -175,7 +175,7 @@ int Main_Window::receive_event(SDL_Event &ev)
     {
       default:break;
     }
-    return;
+    return 0;
   }
   check_quit(ev);
 
@@ -891,6 +891,7 @@ int Main_Window::receive_event(SDL_Event &ev)
       default:
       break;
   }
+  return 0;
 }
 
 void Main_Window::run()

pc/ext/NativeFileDialog/nfd_cocoa.m

@@ -8,6 +8,13 @@
 #include "nfd.h"
 #include "nfd_common.h"
 
+/* OSX Compatibility Hack for MacOS < 10.9. This was tested on 10.6.8 Snow Leopard */
+#ifdef __MAC_OS_X_VERSION_MAX_ALLOWED
+#   if __MAC_OS_X_VERSION_MAX_ALLOWED < 1090
+#       define NSModalResponseOK NSAlertDefaultReturn
+#   endif
+#endif
+
 static NSArray *BuildAllowedFileTypes( const char *filterList )
 {
     // Commas and semicolons are the same thing on this platform

pc/ext/lzma1505/C/Util/7z/makefile.gcc

@@ -8,8 +8,10 @@ else ifeq ($(uname_S), Cross_Windows)
 endif
 
 ifeq ($(uname_S), Darwin)
-	OSX_BACKSUPPORT = -arch x86_64 -mmacosx-version-min=10.9 \
-	-DMAC_OS_X_VERSION_MIN_REQUIRED=1090
+	ifeq ($(OSX_BACKSUPPORT), 1)
+		OSX_BACKSUPPORT = -arch x86_64 -mmacosx-version-min=10.9 \
+		-DMAC_OS_X_VERSION_MIN_REQUIRED=1090
+	endif
 	CFLAGS += $(OSX_BACKSUPPORT)
 	LDFLAGS += $(OSX_BACKSUPPORT)
 endif

pc/ext/unrar/makefile

@@ -12,8 +12,10 @@ else ifeq ($(uname_S), Cross_Windows)
 endif
 
 ifeq ($(uname_S), Darwin)
-	OSX_BACKSUPPORT = -arch x86_64 -mmacosx-version-min=10.9 \
-	-DMAC_OS_X_VERSION_MIN_REQUIRED=1090
+	ifeq ($(OSX_BACKSUPPORT), 1)
+		OSX_BACKSUPPORT = -arch x86_64 -mmacosx-version-min=10.9 \
+		-DMAC_OS_X_VERSION_MIN_REQUIRED=1090
+	endif
 	CXXFLAGS += $(OSX_BACKSUPPORT)
 	LDFLAGS += $(OSX_BACKSUPPORT)
 endif

pc/shared/Experience.h

@@ -5,5 +5,5 @@ struct Experience
   virtual void run() {};
   virtual void one_time_draw() {}
   virtual void draw() {};
-  virtual int receive_event(SDL_Event &ev) {};
+  virtual int receive_event(SDL_Event &ev) {return 0;};
 };

pc/shared/SdlNfd.cpp

@@ -15,6 +15,8 @@ int SdlNfd::init(SDL_Window *win)
     return -2; // already loaded*/
 
   _sdlWindow = win;
+
+  return 0;
 }
 
 

pc/shared/gui/MouseCursors.cpp

@@ -479,7 +479,7 @@ void MouseCursors::prev()
   set_cursor(index);
 }
 
-int MouseCursors::handle_event(const SDL_Event &ev)
+void MouseCursors::handle_event(const SDL_Event &ev)
 {
   BmpCursorAni::handle_event(ev);
   MouseTextureAni::handle_event(ev);

pc/shared/gui/MouseCursors.h

@@ -135,7 +135,7 @@ struct MouseCursors
 	void next();
 	void prev();
 
-  int handle_event(const SDL_Event &ev);
+  void handle_event(const SDL_Event &ev);
   void draw_aux();
 
 private:

pc/shared/gui/Spc_Export_Window.cpp

@@ -26,6 +26,7 @@ Spc_Export_Window::~Spc_Export_Window()
 int Spc_Export_Window::init()
 {
   // Prepare SPC memory area for export
+  return 0;
 }
 
 void Spc_Export_Window::show()
@@ -151,7 +152,7 @@ int Spc_Export_Window::receive_event(SDL_Event &ev)
     case SDL_MOUSEBUTTONDOWN:
     {
       if (export_button.check_mouse_and_execute(mouse::prescaled_x, mouse::prescaled_y))
-        return;
+        return 0;
       //if (r) return r;
     } break;
 

pc/shared/gui/Tab.cpp

@@ -7,6 +7,7 @@ bool Tab::check_mouse_and_execute(int x, int y, void *newdata/*=NULL*/)
 {
   if (enabled)
     return Clickable_Rect::check_mouse_and_execute(x,y,newdata);
+  else {return false;}
 }
 
 int Tab::horiz_pixel_length()

pc/shared/gui/Text_Edit_Rect.cpp

@@ -103,6 +103,7 @@ static inline int check_dblclick(const SDL_Event &ev, Text_Edit_Rect *ter)
       break;
     default:break;
   }
+  return 0;
 }
 
 void Text_Edit_Rect::stop_editing(Text_Edit_Rect *ter/*=cur_editing_ter*/)
@@ -244,6 +245,7 @@ int Text_Edit_Rect::clicked_callback(void *data)
     SDL_StopTextInput();
     Text_Edit_Rect::cursor.stop_timer();
   }
+  return 0;
 }
 
 void Text_Edit_Rect::one_time_draw(SDL_Surface *screen)

pc/shared/windows/Options_Window/Audio_Options.cpp

@@ -11,6 +11,7 @@ int Audio_Options::Context::change_audio_out_device(void *item)
   SDL_Log("change_audio_out_device, %s", itemp->clickable_text.str);
   if (ao->openDeviceonClick)
     ::player->init(::player->sample_rate, itemp->clickable_text.str);
+  return 0;
 }
 
 Audio_Options::Context::Context(Audio_Options *ao) : ao(ao)
@@ -131,4 +132,5 @@ int Audio_Options::receive_event(SDL_Event &ev)
 
     default:break;
   }
+  return 0;
 }

pc/tracker/BpmSpdAddWidget.cpp

@@ -99,6 +99,7 @@ int BpmSpdAddWidget::handle_event(const SDL_Event &ev)
 
   add_incbtn.check_event(ev);
   add_decbtn.check_event(ev);
+  return 0;
 }
 
 //void BpmSpdAddWidget::one_time_draw(SDL_Surface *screen/*=::render->screen*/)
@@ -128,37 +129,43 @@ int BpmSpdAddWidget::incbpm(void *bsaw)
   BpmSpdAddWidget *b = (BpmSpdAddWidget *)bsaw;
   b->tracker->song.settings.inc_bpm();
   b->updatebpm();
+  return 0;
 }
 
 int BpmSpdAddWidget::decbpm(void *bsaw)
 {
   BpmSpdAddWidget *b = (BpmSpdAddWidget *)bsaw;
   b->tracker->song.settings.dec_bpm();
   b->updatebpm();
+  return 0;
 }
 
 int BpmSpdAddWidget::incspd(void *bsaw)
 {
   BpmSpdAddWidget *b = (BpmSpdAddWidget *)bsaw;
   b->tracker->song.settings.inc_spd();
   b->updatespd();
+  return 0;
 }
 
 int BpmSpdAddWidget::decspd(void *bsaw)
 {
   BpmSpdAddWidget *b = (BpmSpdAddWidget *)bsaw;
   b->tracker->song.settings.dec_spd();
   b->updatespd();
+  return 0;
 }
 
 int BpmSpdAddWidget::incadd(void *bsaw)
 {
   BpmSpdAddWidget *b = (BpmSpdAddWidget *)bsaw;
   b->pep->inc_addval();
+  return 0;
 }
 
 int BpmSpdAddWidget::decadd(void *bsaw)
 {
   BpmSpdAddWidget *b = (BpmSpdAddWidget *)bsaw;
   b->pep->dec_addval();
+  return 0;
 }

pc/tracker/ChunkLoader.cpp

@@ -232,6 +232,7 @@ size_t VersionChunkLoader::save(SDL_RWops *file)
   SDL_RWseek(file, chunksize_location, RW_SEEK_SET);
   SDL_RWwrite(file, &chunklen, 2, 1);
   SDL_RWseek(file, chunkend_location, RW_SEEK_SET);
+  return 0;
 }
 
 size_t VersionChunkLoader::load(SDL_RWops *file, size_t chunksize)
@@ -376,4 +377,5 @@ size_t VersionChunkLoader::load(SDL_RWops *file, size_t chunksize)
       maxread += subchunksize;
     }
   }
+  return 0;
 }