From 924c81b404b14da726b65312265768b28713cf18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Roma=C5=84ski?= Date: Sun, 26 Dec 2021 21:38:33 +0100 Subject: [PATCH 1/8] add readme --- README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..90e1bcd --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +Na poziomie pliku .gitignore trzeba dodać katalog z cwiczeń 6 o nazwie `depenendencies` \ No newline at end of file From 7eb0f4cc09e042c9c296a023b2af64104e78b457 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Roma=C5=84ski?= Date: Sun, 26 Dec 2021 21:39:46 +0100 Subject: [PATCH 2/8] Zaktualizuj 'README.md' --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 90e1bcd..a5650d4 100644 --- a/README.md +++ b/README.md @@ -1 +1,3 @@ -Na poziomie pliku .gitignore trzeba dodać katalog z cwiczeń 6 o nazwie `depenendencies` \ No newline at end of file +Na poziomie pliku .gitignore trzeba dodać katalog z cwiczeń 6 o nazwie `dependencies` +Najlepiej robić nowe branche i wystawiać pull requesty. +Link do boarda: git remote add origin https://git.wmi.amu.edu.pl/s452622/GRK-Projekt.git From 826877dc728df4043c3d2961dddaac9728913dba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Roma=C5=84ski?= Date: Sun, 26 Dec 2021 21:41:59 +0100 Subject: [PATCH 3/8] Zaktualizuj 'README.md' --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a5650d4..1201d48 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ -Na poziomie pliku .gitignore trzeba dodać katalog z cwiczeń 6 o nazwie `dependencies` -Najlepiej robić nowe branche i wystawiać pull requesty. -Link do boarda: git remote add origin https://git.wmi.amu.edu.pl/s452622/GRK-Projekt.git +Na poziomie pliku .gitignore trzeba dodać katalog z cwiczeń 6 o nazwie `dependencies` +Najlepiej robić nowe branche i wystawiać pull requesty. +Link do [boarda](https://trello.com/b/iQyTRFCw/grk) From ccb1cef3576f942986b06590d2f5f48d30b047d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Roma=C5=84ski?= Date: Mon, 27 Dec 2021 11:10:39 +0100 Subject: [PATCH 4/8] Zaktualizuj 'README.md' --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 1201d48..e22d508 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,6 @@ -Na poziomie pliku .gitignore trzeba dodać katalog z cwiczeń 6 o nazwie `dependencies` +Żeby skonfigurować ten gówno projekt: +* Na poziomie pliku .gitignore trzeba dodać katalog z cwiczeń 6 o nazwie `dependencies` +* W VS w properties > VC++ Directories > Include directories zamienić wszystko na `$(SolutionDir)dependencies\freeglut\include\GL;$(SolutionDir)dependencies\glew-2.0.0\include\GL;$(SolutionDir)dependencies\glm;$(SolutionDir)dependencies\assimp\include;$(IncludePath)` +* VS w properties > VC++ Directories > Library directories zamienić na `$(SolutionDir)dependencies\freeglut\lib;$(SolutionDir)dependencies\glew-2.0.0\lib\Release\Win32;$(SolutionDir)dependencies\assimp\Release;$(LibraryPath)` Najlepiej robić nowe branche i wystawiać pull requesty. Link do [boarda](https://trello.com/b/iQyTRFCw/grk) From e29f416d46d5818eb093bf743d9119618cc244f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Roma=C5=84ski?= Date: Mon, 27 Dec 2021 11:11:02 +0100 Subject: [PATCH 5/8] Zaktualizuj 'README.md' --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e22d508..2d70de2 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ Żeby skonfigurować ten gówno projekt: * Na poziomie pliku .gitignore trzeba dodać katalog z cwiczeń 6 o nazwie `dependencies` * W VS w properties > VC++ Directories > Include directories zamienić wszystko na `$(SolutionDir)dependencies\freeglut\include\GL;$(SolutionDir)dependencies\glew-2.0.0\include\GL;$(SolutionDir)dependencies\glm;$(SolutionDir)dependencies\assimp\include;$(IncludePath)` -* VS w properties > VC++ Directories > Library directories zamienić na `$(SolutionDir)dependencies\freeglut\lib;$(SolutionDir)dependencies\glew-2.0.0\lib\Release\Win32;$(SolutionDir)dependencies\assimp\Release;$(LibraryPath)` +* VS w properties > VC++ Directories > Library directories zamienić na `$(SolutionDir)dependencies\freeglut\lib;$(SolutionDir)dependencies\glew-2.0.0\lib\Release\Win32;$(SolutionDir)dependencies\assimp\Release;$(LibraryPath)` Najlepiej robić nowe branche i wystawiać pull requesty. Link do [boarda](https://trello.com/b/iQyTRFCw/grk) From 3aaf9a5ac97accb66fbafb333908f0aa5da3565d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Roma=C5=84ski?= Date: Mon, 27 Dec 2021 11:11:15 +0100 Subject: [PATCH 6/8] Zaktualizuj 'README.md' --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 2d70de2..c67e19e 100644 --- a/README.md +++ b/README.md @@ -2,5 +2,6 @@ * Na poziomie pliku .gitignore trzeba dodać katalog z cwiczeń 6 o nazwie `dependencies` * W VS w properties > VC++ Directories > Include directories zamienić wszystko na `$(SolutionDir)dependencies\freeglut\include\GL;$(SolutionDir)dependencies\glew-2.0.0\include\GL;$(SolutionDir)dependencies\glm;$(SolutionDir)dependencies\assimp\include;$(IncludePath)` * VS w properties > VC++ Directories > Library directories zamienić na `$(SolutionDir)dependencies\freeglut\lib;$(SolutionDir)dependencies\glew-2.0.0\lib\Release\Win32;$(SolutionDir)dependencies\assimp\Release;$(LibraryPath)` + Najlepiej robić nowe branche i wystawiać pull requesty. Link do [boarda](https://trello.com/b/iQyTRFCw/grk) From 67314a735b77ff22f9281fc2091847b8ee56ac47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Roma=C5=84ski?= Date: Mon, 27 Dec 2021 11:15:46 +0100 Subject: [PATCH 7/8] Zaktualizuj 'README.md' --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c67e19e..a1b4b47 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ Żeby skonfigurować ten gówno projekt: * Na poziomie pliku .gitignore trzeba dodać katalog z cwiczeń 6 o nazwie `dependencies` * W VS w properties > VC++ Directories > Include directories zamienić wszystko na `$(SolutionDir)dependencies\freeglut\include\GL;$(SolutionDir)dependencies\glew-2.0.0\include\GL;$(SolutionDir)dependencies\glm;$(SolutionDir)dependencies\assimp\include;$(IncludePath)` -* VS w properties > VC++ Directories > Library directories zamienić na `$(SolutionDir)dependencies\freeglut\lib;$(SolutionDir)dependencies\glew-2.0.0\lib\Release\Win32;$(SolutionDir)dependencies\assimp\Release;$(LibraryPath)` +* VS properties > VC++ Directories > Library directories zamienić na `$(SolutionDir)dependencies\freeglut\lib;$(SolutionDir)dependencies\glew-2.0.0\lib\Release\Win32;$(SolutionDir)dependencies\assimp\Release;$(LibraryPath)` +* VS properties > C/C++ > Preprocessor > Preprocessor definitions dodać `_CRT_SECURE_NO_WARNINGS` Najlepiej robić nowe branche i wystawiać pull requesty. Link do [boarda](https://trello.com/b/iQyTRFCw/grk) From cdd1382a2bfee79d7d3149a80a3c9f8169dcc862 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Roma=C5=84ski?= Date: Mon, 27 Dec 2021 11:16:06 +0100 Subject: [PATCH 8/8] Zaktualizuj 'README.md' --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a1b4b47..bbd3218 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ * Na poziomie pliku .gitignore trzeba dodać katalog z cwiczeń 6 o nazwie `dependencies` * W VS w properties > VC++ Directories > Include directories zamienić wszystko na `$(SolutionDir)dependencies\freeglut\include\GL;$(SolutionDir)dependencies\glew-2.0.0\include\GL;$(SolutionDir)dependencies\glm;$(SolutionDir)dependencies\assimp\include;$(IncludePath)` * VS properties > VC++ Directories > Library directories zamienić na `$(SolutionDir)dependencies\freeglut\lib;$(SolutionDir)dependencies\glew-2.0.0\lib\Release\Win32;$(SolutionDir)dependencies\assimp\Release;$(LibraryPath)` -* VS properties > C/C++ > Preprocessor > Preprocessor definitions dodać `_CRT_SECURE_NO_WARNINGS` +* VS properties > C/C++ > Preprocessor > Preprocessor definitions dodać `;_CRT_SECURE_NO_WARNINGS` Najlepiej robić nowe branche i wystawiać pull requesty. Link do [boarda](https://trello.com/b/iQyTRFCw/grk)