From 1c97171f69cd704db6e2aa0f93dec772d0e18792 Mon Sep 17 00:00:00 2001 From: starkos Date: Fri, 5 Dec 2008 21:18:47 +0000 Subject: Big refactoring, bug fixes bug and small, performance improvements (branches/csharp r607:628) --- samples/project/CppConsoleApp/CppConsoleApp.cpp | 7 ++++++ samples/project/CppConsoleApp/premake4.lua | 9 ++++++++ samples/project/CppSharedLib/CppSharedLib.cpp | 6 +++++ samples/project/CppSharedLib/CppSharedLib.def | 2 ++ samples/project/CppSharedLib/premake4.lua | 12 ++++++++++ samples/project/CppStaticLib/CppStaticLib.cpp | 6 +++++ samples/project/CppStaticLib/premake4.lua | 11 +++++++++ samples/project/CppWindowedApp/CppWindowedApp.cpp | 7 ++++++ samples/project/CppWindowedApp/premake4.lua | 13 +++++++++++ samples/project/premake4 | 2 ++ samples/project/premake4.lua | 27 +++++++++++++++++++++++ 11 files changed, 102 insertions(+) create mode 100644 samples/project/CppConsoleApp/CppConsoleApp.cpp create mode 100644 samples/project/CppConsoleApp/premake4.lua create mode 100644 samples/project/CppSharedLib/CppSharedLib.cpp create mode 100644 samples/project/CppSharedLib/CppSharedLib.def create mode 100644 samples/project/CppSharedLib/premake4.lua create mode 100644 samples/project/CppStaticLib/CppStaticLib.cpp create mode 100644 samples/project/CppStaticLib/premake4.lua create mode 100644 samples/project/CppWindowedApp/CppWindowedApp.cpp create mode 100644 samples/project/CppWindowedApp/premake4.lua create mode 100644 samples/project/premake4 create mode 100644 samples/project/premake4.lua (limited to 'samples') diff --git a/samples/project/CppConsoleApp/CppConsoleApp.cpp b/samples/project/CppConsoleApp/CppConsoleApp.cpp new file mode 100644 index 0000000..c237aba --- /dev/null +++ b/samples/project/CppConsoleApp/CppConsoleApp.cpp @@ -0,0 +1,7 @@ +#include + +int main() +{ + printf("CppConsoleApp\n"); + return 0; +} diff --git a/samples/project/CppConsoleApp/premake4.lua b/samples/project/CppConsoleApp/premake4.lua new file mode 100644 index 0000000..ced2554 --- /dev/null +++ b/samples/project/CppConsoleApp/premake4.lua @@ -0,0 +1,9 @@ +project "CppConsoleApp" + + kind "ConsoleApp" + language "C++" + + files "*.cpp" + + libdirs { "../lib" } + links { "CppSharedLib" } diff --git a/samples/project/CppSharedLib/CppSharedLib.cpp b/samples/project/CppSharedLib/CppSharedLib.cpp new file mode 100644 index 0000000..42ecddc --- /dev/null +++ b/samples/project/CppSharedLib/CppSharedLib.cpp @@ -0,0 +1,6 @@ +#include + +void CppSharedLib() +{ + printf("CppSharedLib\n"); +} diff --git a/samples/project/CppSharedLib/CppSharedLib.def b/samples/project/CppSharedLib/CppSharedLib.def new file mode 100644 index 0000000..16d9889 --- /dev/null +++ b/samples/project/CppSharedLib/CppSharedLib.def @@ -0,0 +1,2 @@ +EXPORTS + CppSharedLib \ No newline at end of file diff --git a/samples/project/CppSharedLib/premake4.lua b/samples/project/CppSharedLib/premake4.lua new file mode 100644 index 0000000..afbd38a --- /dev/null +++ b/samples/project/CppSharedLib/premake4.lua @@ -0,0 +1,12 @@ +project "CppSharedLib" + + kind "SharedLib" + language "C++" + files { "*.cpp", "CppSharedLib.def" } + + configuration "Debug" + targetdir "lib/debug" + + configuration "Release" + targetdir "lib/release" + flags { "NoImportLib" } \ No newline at end of file diff --git a/samples/project/CppStaticLib/CppStaticLib.cpp b/samples/project/CppStaticLib/CppStaticLib.cpp new file mode 100644 index 0000000..995220a --- /dev/null +++ b/samples/project/CppStaticLib/CppStaticLib.cpp @@ -0,0 +1,6 @@ +#include + +void CppStaticLib() +{ + printf("CppStaticLib\n"); +} diff --git a/samples/project/CppStaticLib/premake4.lua b/samples/project/CppStaticLib/premake4.lua new file mode 100644 index 0000000..91edebd --- /dev/null +++ b/samples/project/CppStaticLib/premake4.lua @@ -0,0 +1,11 @@ +project "CppStaticLib" + + kind "StaticLib" + language "C++" + files { "*.cpp" } + + configuration "Debug" + targetdir "lib/debug" + + configuration "Release" + targetdir "lib/release" diff --git a/samples/project/CppWindowedApp/CppWindowedApp.cpp b/samples/project/CppWindowedApp/CppWindowedApp.cpp new file mode 100644 index 0000000..ab788a2 --- /dev/null +++ b/samples/project/CppWindowedApp/CppWindowedApp.cpp @@ -0,0 +1,7 @@ +#include + +int main() +{ + printf("CppWindowedApp\n"); + return 0; +} diff --git a/samples/project/CppWindowedApp/premake4.lua b/samples/project/CppWindowedApp/premake4.lua new file mode 100644 index 0000000..e5f8c5e --- /dev/null +++ b/samples/project/CppWindowedApp/premake4.lua @@ -0,0 +1,13 @@ +project "CppWindowedApp" + + kind "WindowedApp" + language "C++" + + files "*.cpp" + + libdirs { "../lib" } + links { "CppStaticLib" } + + configuration "windows" + links { "user32", "gdi32" } + diff --git a/samples/project/premake4 b/samples/project/premake4 new file mode 100644 index 0000000..2c6c4a3 --- /dev/null +++ b/samples/project/premake4 @@ -0,0 +1,2 @@ +#!/bin/sh +../../bin/debug/premake4 /scripts=../../src $1 $2 $3 $4 $5 $6 diff --git a/samples/project/premake4.lua b/samples/project/premake4.lua new file mode 100644 index 0000000..b5a1788 --- /dev/null +++ b/samples/project/premake4.lua @@ -0,0 +1,27 @@ +solution "PremakeTestbox" + configurations { "Debug", "Release" } + + location "build" + + configuration "Debug" + targetdir "bin/debug" + flags { "Symbols" } + defines { "_DEBUG", "DEBUG" } + + configuration "Release" + targetdir "bin/release" + flags { "Optimize" } + defines { "NDEBUG" } + + +include "CppConsoleApp" +include "CppWindowedApp" +include "CppSharedLib" +include "CppStaticLib" + +function onclean() + os.rmdir("bin") + os.rmdir("CppSharedLib/lib") + os.rmdir("CppStaticLib/lib") +end + -- cgit v1.2.3