* moved project files to Source directory

! fixes related to GCC compiler warnings (unused function removed, wrong formatting options, "bad" initialization) * updated MinGW Makefile
White-Tiger · Jun 18, 2014 · 12aef07 · 12aef07
1 parent 593704d
commit 12aef07
Show file tree

Hide file tree

Showing 14 changed files with 542 additions and 538 deletions.
diff --git a/Makefile b/Makefile
diff --git a/Source/Clock/PageMouse.c b/Source/Clock/PageMouse.c
@@ -7,7 +7,6 @@
 static void OnInit(HWND hDlg,HWND* hList);
 static void OnApply(HWND hDlg);
 static void OnDestroy();
-static void OnMouseFileChange(HWND hDlg);
 static void OnSansho(HWND hDlg, WORD id);
 static void InitMouseFuncList(HWND hDlg);
 

diff --git a/Source/Clock/StopWatch.c b/Source/Clock/StopWatch.c
@@ -2,9 +2,9 @@
 // Modified by Stoic Joker: Monday, 03/22/2010 @ 7:32:29pm
 #include "tclock.h"
 
-LARGE_INTEGER g_frequency={0};
+LARGE_INTEGER g_frequency={{0}};
 LARGE_INTEGER g_start;// start time
-LARGE_INTEGER g_lap={0};// latest lap time
+LARGE_INTEGER g_lap={{0}};// latest lap time
 LARGE_INTEGER g_stop;// latest lap time
 BOOL g_paused; // Global Pause/Resume Displayed Counter.
 //================================================================================================
@@ -55,7 +55,7 @@ void OnTimer(HWND hDlg)   //----------------------------------------------------
 	hrs=un.elapsed/3600000; un.elapsed%=3600000;
 	min=un.elapsed/60000; un.elapsed%=60000;
 	sec=un.elapsed/1000; un.elapsed%=1000;
-	sprintf(szElapsed,"%02dH: %02dM: %02dS: %03dms",hrs,min,sec,un.elapsed);
+	sprintf(szElapsed,"%02dH: %02dM: %02dS: %03lums",hrs,min,sec,un.elapsed);
 	SetDlgItemText(hDlg, IDCE_SW_ELAPSED, szElapsed);
 }
 //================================================================================================
@@ -88,7 +88,7 @@ void InsertLapTime(HWND hList)   //---------------------------------------------
 	lvItem.pszText=buf;
 	ListView_InsertItem(hList,&lvItem);
 
-	sprintf(buf,"%02d:%02d:%02d.%03d",hrs,min,elapsed/1000,elapsed%1000);
+	sprintf(buf,"%02d:%02d:%02lu.%03lu",hrs,min,elapsed/1000,elapsed%1000);
 	lvItem.iSubItem=1;
 	ListView_SetItem(hList,&lvItem);
 }

diff --git a/Source/Makefile b/Source/Makefile
diff --git a/T-Clock 2010.sln → Source/T-Clock 2010.sln b/T-Clock 2010.sln → Source/T-Clock 2010.sln
@@ -1,37 +1,37 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0455B526-7932-4D53-AAEF-0C7BBD00CE8E}"
-	ProjectSection(SolutionItems) = preProject
-		Source\To-Do List.txt = Source\To-Do List.txt
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Win32.Clock", "Source\Clock\Win32\Win32.Clock.vcxproj", "{27EF0E4F-0E60-461B-9BA6-06AA1FF3E066}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Win32.DLL", "Source\DLL\Win32\Win32.DLL.vcxproj", "{6E055518-FDC0-4B59-BEB8-60A3874C8F76}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Calendar", "Source\Calendar\Calendar.vcxproj", "{1f5284e0-13ef-11e3-8ffd-0800200c9a66}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{27EF0E4F-0E60-461B-9BA6-06AA1FF3E066}.Release|Win32.ActiveCfg = Release|Win32
-		{27EF0E4F-0E60-461B-9BA6-06AA1FF3E066}.Release|Win32.Build.0 = Release|Win32
-		{27EF0E4F-0E60-461B-9BA6-06AA1FF3E066}.Release|x64.ActiveCfg = Release|x64
-		{27EF0E4F-0E60-461B-9BA6-06AA1FF3E066}.Release|x64.Build.0 = Release|x64
-		{6E055518-FDC0-4B59-BEB8-60A3874C8F76}.Release|Win32.ActiveCfg = Release|Win32
-		{6E055518-FDC0-4B59-BEB8-60A3874C8F76}.Release|Win32.Build.0 = Release|Win32
-		{6E055518-FDC0-4B59-BEB8-60A3874C8F76}.Release|x64.ActiveCfg = Release|x64
-		{6E055518-FDC0-4B59-BEB8-60A3874C8F76}.Release|x64.Build.0 = Release|x64
-		{1f5284e0-13ef-11e3-8ffd-0800200c9a66}.Release|Win32.ActiveCfg = Release|Win32
-		{1f5284e0-13ef-11e3-8ffd-0800200c9a66}.Release|Win32.Build.0 = Release|Win32
-		{1f5284e0-13ef-11e3-8ffd-0800200c9a66}.Release|x64.ActiveCfg = Release|x64
-		{1f5284e0-13ef-11e3-8ffd-0800200c9a66}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0455B526-7932-4D53-AAEF-0C7BBD00CE8E}"
+	ProjectSection(SolutionItems) = preProject
+		To-Do List.txt = To-Do List.txt
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Win32.Clock", "Clock\Win32\Win32.Clock.vcxproj", "{27EF0E4F-0E60-461B-9BA6-06AA1FF3E066}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Win32.DLL", "DLL\Win32\Win32.DLL.vcxproj", "{6E055518-FDC0-4B59-BEB8-60A3874C8F76}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Calendar", "Calendar\Calendar.vcxproj", "{1f5284e0-13ef-11e3-8ffd-0800200c9a66}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{27EF0E4F-0E60-461B-9BA6-06AA1FF3E066}.Release|Win32.ActiveCfg = Release|Win32
+		{27EF0E4F-0E60-461B-9BA6-06AA1FF3E066}.Release|Win32.Build.0 = Release|Win32
+		{27EF0E4F-0E60-461B-9BA6-06AA1FF3E066}.Release|x64.ActiveCfg = Release|x64
+		{27EF0E4F-0E60-461B-9BA6-06AA1FF3E066}.Release|x64.Build.0 = Release|x64
+		{6E055518-FDC0-4B59-BEB8-60A3874C8F76}.Release|Win32.ActiveCfg = Release|Win32
+		{6E055518-FDC0-4B59-BEB8-60A3874C8F76}.Release|Win32.Build.0 = Release|Win32
+		{6E055518-FDC0-4B59-BEB8-60A3874C8F76}.Release|x64.ActiveCfg = Release|x64
+		{6E055518-FDC0-4B59-BEB8-60A3874C8F76}.Release|x64.Build.0 = Release|x64
+		{1f5284e0-13ef-11e3-8ffd-0800200c9a66}.Release|Win32.ActiveCfg = Release|Win32
+		{1f5284e0-13ef-11e3-8ffd-0800200c9a66}.Release|Win32.Build.0 = Release|Win32
+		{1f5284e0-13ef-11e3-8ffd-0800200c9a66}.Release|x64.ActiveCfg = Release|x64
+		{1f5284e0-13ef-11e3-8ffd-0800200c9a66}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/Source/T-Clock 2010.workspace b/Source/T-Clock 2010.workspace
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_workspace_file>
+	<Workspace title="T-Clock 2010">
+		<Project filename="T-Clock.cbp" />
+		<Project filename="T-Clock64.cbp" />
+		<Project filename="T-Clock-XPCalendar.cbp" />
+	</Workspace>
+</CodeBlocks_workspace_file>
diff --git a/T-Clock-XPCalendar.cbp → Source/T-Clock-XPCalendar.cbp b/T-Clock-XPCalendar.cbp → Source/T-Clock-XPCalendar.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="msvc10" />
 		<Build>
 			<Target title="app">
-				<Option output="Release/Win32/XPCalendar" prefix_auto="1" extension_auto="1" />
+				<Option output="../Release/Win32/XPCalendar" prefix_auto="1" extension_auto="1" />
 				<Option object_output=".obj/" />
 				<Option type="0" />
 				<Option compiler="msvc10" />
@@ -20,11 +20,11 @@
 				</Compiler>
 				<Linker>
 					<Add option="/LTCG" />
-					<Add directory="Release/Win32" />
+					<Add directory="../Release/Win32" />
 				</Linker>
 			</Target>
 			<Target title="app64">
-				<Option output="Release/x64/XPCalendar" prefix_auto="1" extension_auto="1" />
+				<Option output="../Release/x64/XPCalendar" prefix_auto="1" extension_auto="1" />
 				<Option object_output=".obj64/" />
 				<Option type="0" />
 				<Option compiler="microsoft_visual_c_2010_64bit" />
@@ -37,11 +37,11 @@
 				</Compiler>
 				<Linker>
 					<Add option="/LTCG" />
-					<Add directory="Release/Win32" />
+					<Add directory="../Release/Win32" />
 				</Linker>
 			</Target>
 			<Target title="app debug">
-				<Option output="Debug/Win32/XPCalendar" prefix_auto="1" extension_auto="1" />
+				<Option output="../Debug/Win32/XPCalendar" prefix_auto="1" extension_auto="1" />
 				<Option object_output=".obj/dbg/" />
 				<Option type="0" />
 				<Option compiler="msvc10" />
@@ -52,11 +52,11 @@
 				</Compiler>
 				<Linker>
 					<Add option="/DEBUG" />
-					<Add directory="Debug/Win32" />
+					<Add directory="../Debug/Win32" />
 				</Linker>
 			</Target>
 			<Target title="app64 debug">
-				<Option output="Debug/x64/XPCalendar" prefix_auto="1" extension_auto="1" />
+				<Option output="../Debug/x64/XPCalendar" prefix_auto="1" extension_auto="1" />
 				<Option object_output=".obj64/dbg/" />
 				<Option type="0" />
 				<Option compiler="microsoft_visual_c_2010_64bit" />
@@ -67,7 +67,7 @@
 				</Compiler>
 				<Linker>
 					<Add option="/DEBUG" />
-					<Add directory="Debug/Win32" />
+					<Add directory="../Debug/Win32" />
 				</Linker>
 			</Target>
 		</Build>
@@ -95,14 +95,14 @@
 			<Add library="Advapi32" />
 			<Add library="Comctl32" />
 		</Linker>
-		<Unit filename="Source/Calendar/DeskCalendar.c">
+		<Unit filename="Calendar/DeskCalendar.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="Source/Calendar/resource.h" />
-		<Unit filename="Source/Calendar/resource.rc">
+		<Unit filename="Calendar/resource.h" />
+		<Unit filename="Calendar/resource.rc">
 			<Option compilerVar="WINDRES" />
 		</Unit>
-		<Unit filename="Source/Clock/utl.c">
+		<Unit filename="Clock/utl.c">
 			<Option compilerVar="CC" />
 		</Unit>
 		<Extensions>