Subversion Repositories Kolibri OS

Compare Revisions

No changes between revisions

Regard whitespace Rev 9757 → Rev 9758

/contrib/sdk/samples/cpp_hello/Makefile
3,25 → 3,21
 
SDK_DIR = $(abspath ../..)
 
LDFLAGS = -static -nostdlib -T $(SDK_DIR)/sources/newlib/app.lds --image-base 0
CFLAGS = -c -fno-ident -O2 -fomit-frame-pointer -U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32 -Wno-pointer-arith
LDFLAGS = -static -S -Tapp-dynamic.lds --image-base 0
 
CFLAGS = -c -fno-ident -O2 -fomit-frame-pointer -fno-ident -U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32 -Wno-pointer-arith
 
INCLUDES = -I $(SDK_DIR)/sources/newlib/libc/include -I $(SDK_DIR)/sources/libstdc++-v3/include
LIBPATH = -L $(SDK_DIR)/lib -L /home/autobuild/tools/win32/mingw32/lib
LIBPATH = -L $(SDK_DIR)/lib
 
SOURCES = hello.cpp \
$(NULL)
 
SOURCES = hello.cpp
OBJECTS = $(patsubst %.cpp, %.o, $(SOURCES))
 
default: hello
 
hello: $(OBJECTS) Makefile
$(LD) $(LDFLAGS) $(LIBPATH) --subsystem console -o hello.kex $(OBJECTS) -lstdc++ -lsupc++ -lgcc -lc.dll
strip -s hello.kex -o hello.kex
objcopy hello.kex -O binary
rm *.o
$(LD) $(LDFLAGS) $(LIBPATH) --subsystem console -o hello $(OBJECTS) -lstdc++ -lsupc++ -lgcc -lc.dll
strip -s hello -o hello
objcopy hello -O binary
 
%.o : %.cpp Makefile $(SOURCES)
$(CC) $(CFLAGS) $(INCLUDES) -o $@ $<
/contrib/sdk/samples/cpp_hello/hello.cpp
1,21 → 1,16
// for 'cout'
#include <iostream>
#include <sys/kos_LoadConsole.h> // to load console.obj
 
// for 'console.obj' functions
#include <sys/kos_LoadConsole.h>
 
using namespace std;
 
int main()
{
// load console.obj
int main() {
load_console();
con_set_title("C++ Console.obj example");
cout << "Press any key...\n";
con_getch();
cout << "Hello, KolibriOS!\n";
con_set_title("Hello");
return 0;
}
/contrib/sdk/samples/hello/Makefile.shared
File deleted
/contrib/sdk/samples/hello/Makefile
0,0 → 1,25
# dynamic linking
 
CC = kos32-gcc
LD = kos32-ld
 
SDK_DIR = $(abspath ../..)
 
CFLAGS = -c -fno-ident -O2 -fomit-frame-pointer -U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32
LDFLAGS = -static -S -Tapp-dynamic.lds --image-base 0
 
INCLUDES = -I $(SDK_DIR)/sources/newlib/libc/include
LIBPATH = -L $(SDK_DIR)/lib
 
SOURCES = hello.c
OBJECTS = $(patsubst %.c, %.o, $(SOURCES))
 
default: hello
 
hello: $(OBJECTS) Makefile
$(LD) $(LDFLAGS) $(LIBPATH) -o hello $(OBJECTS) -lgcc -lc.dll
strip -s hello -o hello
objcopy hello -O binary
 
%.o : %.c Makefile $(SOURCES)
$(CC) $(CFLAGS) $(INCLUDES) -o $@ $<
Property changes:
Added: svn:executable
+*
\ No newline at end of property
/contrib/sdk/samples/hello/Makefile.static
1,25 → 1,23
# static linking
 
CC = kos32-gcc
LD = kos32-ld
 
SDK_DIR:= $(abspath ../..)
SDK_DIR = $(abspath ../..)
 
CFLAGS = -c -fno-ident -O2 -fomit-frame-pointer -U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32
LDFLAGS = -static -Tapp-static.lds
 
CFLAGS = -c -fno-ident -O2 -fomit-frame-pointer -U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32
 
INCLUDES= -I $(SDK_DIR)/sources/newlib/libc/include
LIBPATH:= -L $(SDK_DIR)/lib
LIBPATH = -L $(SDK_DIR)/lib
 
SOURCES = hello.c \
$(NULL)
 
SOURCES = hello.c
OBJECTS = $(patsubst %.c, %.o, $(SOURCES))
 
default: hello
 
hello: $(OBJECTS) Makefile.static
$(LD) $(LDFLAGS) $(LIBPATH) -Map hello.map -o hello $(OBJECTS) -lc -lgcc -lc
$(LD) $(LDFLAGS) $(LIBPATH) -o hello $(OBJECTS) -lc -lgcc -lc
objcopy hello -O binary
 
%.o : %.c Makefile.static $(SOURCES)
/contrib/sdk/samples/hello/hello.c
1,9 → 1,6
#include <stdio.h>
 
int main(int argc, char *argv[])
{
 
int main() {
printf("Hello, world!\n");
 
return 0;
};
}