Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Make a single build again. Wootcakes.

  • Loading branch information...
commit ce5a16cf792e33adb99c4e75ef126a13e5aa717d 1 parent d2e5a31
daagaak daagaak authored
2,002 MacIrssi.xcode/project.pbxproj
View
114 additions, 1,888 deletions not shown
17 Source/Irssi Bridge/irssi.m
View
@@ -184,7 +184,7 @@ static void textui_finish_init(void)
signal_add("event connected", (SIGNAL_FUNC) irssibridge_event_connected);
module_register("core", "fe-aqua");
-
+
#ifdef HAVE_STATIC_PERL
perl_core_init();
fe_perl_init();
@@ -212,11 +212,13 @@ void textui_deinit(void)
{
signal(SIGINT, SIG_DFL);
while (modules != NULL)
+ {
module_unload(modules->data);
+ }
#ifdef HAVE_STATIC_PERL
- perl_core_deinit();
- fe_perl_deinit();
+ perl_core_deinit();
+ fe_perl_deinit();
#endif
//signal_remove("gui exit", (SIGNAL_FUNC) sig_exit);
@@ -408,9 +410,14 @@ int irssi_main(int argc, char **argv)
// FIXME: We never unregister this
if (!( majorVersion == 10 && minorVerson == 6 ))
{
+ printtext(NULL, NULL, MSGLEVEL_CLIENTERROR, "Not loading perl modules, perl is only supported on Mac OS X 10.6 (Snow Leopard).");
command_bind_first("script", NULL, (SIGNAL_FUNC)perl_cmd_override);
}
-
+ else {
+ // if we're on the platform we built on. Try loading the perl libraries.
+ signal_emit("command load", 1, "perl");
+ }
+
// Version Overwrite
command_bind_first("version", NULL, (SIGNAL_FUNC)version_cmd_overwrite);
SETTINGS_REC *rec = settings_get_record("ctcp_version_reply");
@@ -432,7 +439,7 @@ int irssi_exit()
majorVersion = (((systemVersion & 0xF000) >> 12) * 10) + ((systemVersion & 0x0F00) >> 8);
minorVerson = ((systemVersion & 0x00F0) >> 4);
- if ( majorVersion == 10 && minorVerson == 4 )
+ if (!( majorVersion == 10 && minorVerson == 6 ))
{
command_unbind("script", (SIGNAL_FUNC)perl_cmd_override);
}
6 irssi-0.8.14/src/core/modules-load.c
View
@@ -116,6 +116,7 @@ static GModule *module_open(const char *name, int *found)
else {
/* first try from home dir */
str = g_strdup_printf("%s/modules", get_irssi_dir());
+
path = g_module_build_path(str, name);
g_free(str);
@@ -128,7 +129,8 @@ static GModule *module_open(const char *name, int *found)
/* module not found from home dir, try global module dir */
g_free(path);
- path = g_module_build_path(MODULEDIR, name);
+ // MacIrssi, /usr/local/lib/foo isn't good on OSX
+ path = g_module_build_path("Contents/Resources", name);
}
*found = stat(path, &statbuf) == 0;
@@ -383,7 +385,7 @@ int module_load(const char *path, char **prefixes)
void module_file_unload(MODULE_FILE_REC *file)
{
MODULE_REC *root;
-
+
root = file->root;
root->files = g_slist_remove(root->files, file);
2  irssi-0.8.14/src/perl/perl-common.c
View
@@ -228,7 +228,7 @@ char *perl_get_use_list(void)
str = g_string_new(NULL);
use_lib = settings_get_str("perl_use_lib");
- g_string_printf(str, "use lib qw(%s/scripts "SCRIPTDIR" %s);",
+ g_string_printf(str, "use lib qw(%s/scripts Contents/Resources/Scripts "SCRIPTDIR" %s);",
get_irssi_dir(), use_lib);
g_string_append(str, "use Irssi;");
2  irssi-0.8.14/src/perl/perl-fe.c
View
@@ -276,5 +276,5 @@ void fe_perl_deinit(void)
signal_remove("complete command script load", (SIGNAL_FUNC) sig_complete_load);
signal_remove("complete command script unload", (SIGNAL_FUNC) sig_complete_unload);
- perl_core_print_script_error(TRUE);
+ //perl_core_print_script_error(TRUE);
}
2  xcodeConfigure.sh
View
@@ -25,6 +25,8 @@ fi
[ -e config.xcode ] && rm config.xcode
+make distclean
+
CFLAGS="$CFLAGS -I$SRCROOT/Frameworks/MILibs/build/Release/include -DMACIRSSI_VERSION=\\\"$VERSION\\\""
LDFLAGS="$LDFLAGS -L$SRCROOT/Frameworks/MILibs/build/Release/lib"
PKG_CONFIG_PATH="$SRCROOT/Frameworks/MILibs/build/Release/lib/pkgconfig"
Please sign in to comment.
Something went wrong with that request. Please try again.