From f3cb9b11b75869919ee5878e742a60488c761799 Mon Sep 17 00:00:00 2001 From: Robin Haberkorn Date: Thu, 10 May 2012 20:48:30 +0200 Subject: fix line-ending confusion --- Makefile | 18 +++++++++--------- icon.rc | 2 +- starter.c | 36 ++++++++++++++++++------------------ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Makefile b/Makefile index 697e32c..0488d60 100644 --- a/Makefile +++ b/Makefile @@ -5,21 +5,21 @@ PERL := perl PERL_CCOPTS := $(shell $(PERL) -MExtUtils::Embed -e ccopts) #PERL_LDOPTS := $(shell $(PERL) -MExtUtils::Embed -e ldopts) PERL_LDOPTS := -L/c/strawberry/perl/lib/CORE -lperl510 - -CFLAGS := $(PERL_CCOPTS) -std=gnu99 -CPPFLAGS := -LDFLAGS := $(PERL_LDOPTS) -Wl,--subsystem,windows - -all : kephra.exe + +CFLAGS := $(PERL_CCOPTS) -std=gnu99 +CPPFLAGS := +LDFLAGS := $(PERL_LDOPTS) -Wl,--subsystem,windows + +all : kephra.exe starter_xsi.c: $(PERL) -MExtUtils::Embed -e xsinit -- -o $@ icon.o : icon.rc kephra_proton.ico $(RC) $< $@ - -kephra.exe : starter.o starter_xsi.o icon.o - $(CC) -o $@ $^ $(LDFLAGS) + +kephra.exe : starter.o starter_xsi.o icon.o + $(CC) -o $@ $^ $(LDFLAGS) clean: rm -f *.o starter_xsi.c kephra.exe diff --git a/icon.rc b/icon.rc index 428d0b1..7ea9e51 100644 --- a/icon.rc +++ b/icon.rc @@ -1 +1 @@ -DEFAULT ICON "kephra_proton.ico" +DEFAULT ICON "kephra_proton.ico" diff --git a/starter.c b/starter.c index ed6f160..a3cf752 100644 --- a/starter.c +++ b/starter.c @@ -4,8 +4,8 @@ #include #include -#include -#include +#include +#include /* perl_parse prefix-parameters */ static const char *prefix[] = { @@ -14,17 +14,17 @@ static const char *prefix[] = { /* in starter_xsi.c */ EXTERN_C void xs_init(pTHX); - -static PerlInterpreter *my_perl; - -int -main(int argc, char **argv, char **env) + +static PerlInterpreter *my_perl; + +int +main(int argc, char **argv, char **env) { int cParams = (sizeof(prefix)/sizeof(*prefix))-1 + argc-1; const char **params, **para; char *path, *p; - + PERL_SYS_INIT3(&argc, &argv, &env); /* fix working directory */ @@ -57,20 +57,20 @@ main(int argc, char **argv, char **env) /* copy kephra.exe parameters */ for (int c = argc - 1; c; c--) *para++ = *++argv; - - my_perl = perl_alloc(); + + my_perl = perl_alloc(); perl_construct(my_perl); - - PL_exit_flags |= PERL_EXIT_DESTRUCT_END; - perl_parse(my_perl, xs_init, cParams, (char **)params, NULL); - perl_run(my_perl); + PL_exit_flags |= PERL_EXIT_DESTRUCT_END; + + perl_parse(my_perl, xs_init, cParams, (char **)params, NULL); + perl_run(my_perl); - perl_destruct(my_perl); + perl_destruct(my_perl); perl_free(my_perl); free(params); -leave: - PERL_SYS_TERM(); -} +leave: + PERL_SYS_TERM(); +} -- cgit v1.2.3