Shtova Ikone

jonibim · Jan 7, 2019 · 44cd1b6 · 44cd1b6
1 parent 38393cd
commit 44cd1b6
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 3 deletions.
diff --git a/UniversityAid/UniversityAid.sln b/UniversityAid/UniversityAid.sln
@@ -15,8 +15,8 @@ Global
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{39BA9947-3E93-488C-A12F-06EB70873BBD}.Debug|x64.ActiveCfg = Debug|x64
 		{39BA9947-3E93-488C-A12F-06EB70873BBD}.Debug|x64.Build.0 = Debug|x64
-		{39BA9947-3E93-488C-A12F-06EB70873BBD}.Debug|x86.ActiveCfg = Debug|x64
-		{39BA9947-3E93-488C-A12F-06EB70873BBD}.Debug|x86.Build.0 = Debug|x64
+		{39BA9947-3E93-488C-A12F-06EB70873BBD}.Debug|x86.ActiveCfg = Debug|Win32
+		{39BA9947-3E93-488C-A12F-06EB70873BBD}.Debug|x86.Build.0 = Debug|Win32
 		{39BA9947-3E93-488C-A12F-06EB70873BBD}.Release|x64.ActiveCfg = Release|x64
 		{39BA9947-3E93-488C-A12F-06EB70873BBD}.Release|x64.Build.0 = Release|x64
 		{39BA9947-3E93-488C-A12F-06EB70873BBD}.Release|x86.ActiveCfg = Release|Win32

diff --git a/UniversityAid/UniversityAid/Icon.ico b/UniversityAid/UniversityAid/Icon.ico
diff --git a/UniversityAid/UniversityAid/Icon.rc b/UniversityAid/UniversityAid/Icon.rc
diff --git a/UniversityAid/UniversityAid/Source.cpp b/UniversityAid/UniversityAid/Source.cpp
@@ -1061,7 +1061,7 @@ void addMarks() {
 								cout << "Program Name: " << faculties[i].departamentet[j].programet[k].nameProgram << " [" << k << "]" << endl;
 								cout << "Subject: " << faculties[i].departamentet[j].programet[k].sub[l].name << " [" << l << "]" << endl;
 								cout << "Pedagogue: " << faculties[i].departamentet[j].programet[k].sub[l].pedagog[m].name << " [" << m << "]" << endl;
-								cout << "Student: " << faculties[i].departamentet[j].programet[k].sub[l].pedagog[m].student[n].name << " " << faculties[i].departamentet[j].programet[k].sub[l].pedagog[m].student[n].surname << endl;
+								cout << "Student: " << faculties[i].departamentet[j].programet[k].sub[l].pedagog[m].student[n].name << " " << faculties[i].departamentet[j].programet[k].sub[l].pedagog[m].student[n].surname << " ["<<n<<"] "<<endl; 
 								count++;
 
 								if (faculties[i].departamentet[j].programet[k].sub[l].pedagog[m].student[n].marks.size() != 0) {

diff --git a/UniversityAid/UniversityAid/UniversityAid.vcxproj b/UniversityAid/UniversityAid/UniversityAid.vcxproj
@@ -76,7 +76,11 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -127,10 +131,14 @@
     <ClInclude Include="Libraries.h" />
     <ClInclude Include="Pedagog.h" />
     <ClInclude Include="Person.h" />
+    <ClInclude Include="resource.h" />
     <ClInclude Include="Student.h" />
     <ClInclude Include="Subjects.h" />
     <ClInclude Include="S_Program.h" />
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Icon.rc" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/UniversityAid/UniversityAid/UniversityAid.vcxproj.filters b/UniversityAid/UniversityAid/UniversityAid.vcxproj.filters
@@ -44,5 +44,13 @@
     <ClInclude Include="Person.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Icon.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
   </ItemGroup>
 </Project>
diff --git a/UniversityAid/UniversityAid/resource.h b/UniversityAid/UniversityAid/resource.h
@@ -0,0 +1,14 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by Icon.rc
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif