Permalink
Browse files

Allow --ruby command line argument when compiled in WIN32, add ssl dl…

…l dist build.
  • Loading branch information...
1 parent fbf72af commit a159a1456d049941f06a526214f2eb4ad93b62a6 @ender672 ender672 committed Apr 4, 2009
Showing with 5 additions and 2 deletions.
  1. +1 −1 Rakefile
  2. +4 −1 bin/main.skel
View
@@ -170,7 +170,7 @@ task :build => [:build_os, "dist/VERSION.txt"] do
when /mingw/
dlls = [ruby_so]
dlls += %w{libungif4 libjpeg libcairo-2 libpng12-0 libglib-2.0-0 libgobject-2.0-0 libpango-1.0-0
- libgmodule-2.0-0 libpangocairo-1.0-0 libpangowin32-1.0-0 libportaudio-2 sqlite3 libssl32}
+ libgmodule-2.0-0 libpangocairo-1.0-0 libpangowin32-1.0-0 libportaudio-2 sqlite3 libssl32 libeay32}
dlls.each{|dll| cp "#{ext_ruby}/bin/#{dll}.dll", "dist/"}
if ENV['VIDEO']
cp "/usr/lib/libvlc.so", "dist"
View
@@ -38,14 +38,14 @@ main(argc, argv)
#ifdef SHOES_WIN32
path = SHOE_ALLOC_N(char, SHOES_BUFSIZE);
GetModuleFileName(NULL, (LPSTR)path, SHOES_BUFSIZE);
- code = shoes_init(inst, style);
#ifdef RUBY_1_9
rb_w32_sysinit(&argc, &argv);
#else
NtInitialize(&argc, &argv);
#endif
#else
path = argv[0];
+#endif
if (argc > 1 && strcmp(argv[1], "--ruby") == 0)
{
char bootup[SHOES_BUFSIZE];
@@ -81,6 +81,9 @@ main(argc, argv)
}
}
+#ifdef SHOES_WIN32
+ code = shoes_init(inst, style);
+#else
code = shoes_init();
#endif
if (code != SHOES_OK)

0 comments on commit a159a14

Please sign in to comment.