add files to build with cmake/Microsoft Visual Studio 2012

Discriminator · Apr 21, 2013 · 685f561 · 685f561
1 parent 4a2e4f2
commit 685f561
Show file tree

Hide file tree

Showing 9 changed files with 148 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -0,0 +1,68 @@
+# CMakeLists.txt
+#
+# Base build script for building with cmake (http://www.cmake.org)
+
+cmake_minimum_required( VERSION 2.8 )
+project( PDW )
+
+# Project version number
+set( PDW_VERSION_MAJOR 3 )
+set( PDW_VERSION_MINOR 1 )
+set( PDW_VERSION_MICRO 0 )
+
+# Set base variables
+set( PDW_GFXS )
+set( PDW_INCLUDES )
+set( PWD_SRCS )
+
+# Subdirectories to go to
+add_subdirectory( GFX )
+add_subdirectory( Headers )
+add_subdirectory( utils )
+
+# Microsoft Visual Studio Specific definitions
+if( MSVC )
+  add_definitions( "-D_CRT_SECURE_NO_WARNINGS" )
+endif( MSVC )
+
+# Include Files
+set( PDW_INCLUDES
+  ${PDW_INCLUDES}
+  resrc1.h
+)
+
+# Source Files
+set( PDW_SRCS
+  ${PDW_SRCS}
+  Flex.cpp
+  Gfx.cpp
+  Initapp.cpp
+  Misc.cpp
+  Rsrc.rc
+  PDW.cpp
+  Pocsag.cpp
+  acars.cpp
+  decode.cpp
+  ermes.cpp
+  helper_funcs.cpp
+  language.cpp
+  menu.cpp
+  mobitex.cpp
+  toolbar.cpp
+  printer.cpp
+  sigind.cpp
+  sound_in.cpp  
+)
+
+# Create executable
+add_executable( PDW WIN32
+  ${PDW_INCLUDES}
+  ${PDW_SRCS}
+)
+
+# Required libraries
+target_link_libraries( PDW
+  Comctl32.lib
+  Winmm.lib
+  Ws2_32.lib 
+)
diff --git a/Flex.cpp b/Flex.cpp
@@ -894,7 +894,8 @@ void frame_flex(char gin)
 
 			if (nOnes(slr[0] ^ slr[3] ^ 0xFFFF) < 2)
 			{
-				for (int speed=0; speed<8; speed++)
+				int speed;
+				for (speed=0; speed<8; speed++)
 				{
 					if ((nOnes(slr[0] ^ syncs[speed]) + nOnes(slr[3] ^ ~syncs[speed])) < 2)
 					{

diff --git a/GFX/CMakeLists.txt b/GFX/CMakeLists.txt
@@ -0,0 +1,3 @@
+# CMakeLists.txt
+#
+# Build script for building with cmake (http://www.cmake.org)
diff --git a/Headers/CMakeLists.txt b/Headers/CMakeLists.txt
@@ -0,0 +1,27 @@
+# CMakeLists.txt
+#
+# Build script for building with cmake (http://www.cmake.org)
+
+set( PDW_INCLUDES
+  ${PDW_INCLUDES}
+  ${CMAKE_CURRENT_SOURCE_DIR}/Resource.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/SLICER.H
+  ${CMAKE_CURRENT_SOURCE_DIR}/acars.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/decode.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/ermes.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/gfx.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/helper_funcs.h
+  #${CMAKE_CURRENT_SOURCE_DIR}/html.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/initapp.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/language.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/menu.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/misc.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/mobitex.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/pdw.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/printer.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/sigind.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/sound_in.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/toolbar.h
+
+  PARENT_SCOPE
+)
diff --git a/Misc.cpp b/Misc.cpp
@@ -498,7 +498,8 @@ void SortGroupCall(int groupbit)	// PH: Sort aGroupCodes[groupbit]
 {
 	for (int nCapcode=1; nCapcode <= aGroupCodes[groupbit][CAPCODES_INDEX]; nCapcode++)
 	{
-		for (int min=nCapcode, j=nCapcode+1; aGroupCodes[groupbit][j] > 0; j++)
+		int min, j;
+		for (min=nCapcode, j=nCapcode+1; aGroupCodes[groupbit][j] > 0; j++)
 		{
 			if (aGroupCodes[groupbit][j] < aGroupCodes[groupbit][min]) min = j;
 		}
@@ -2401,11 +2402,12 @@ int ecd()
 void setupecc()
 {
 	unsigned int srr, j, k;
+	int i, n;
 
 	// calculate all information needed to implement error correction
 	srr = 0x3B4;
 
-	for (int i=0; i<=20; i++)
+	for (i=0; i<=20; i++)
 	{
 		ecs[i] = srr;
 		if ((srr & 0x01) != 0) srr = (srr >> 1) ^ 0x3B4;
@@ -2417,7 +2419,7 @@ void setupecc()
 	// of second error; bits 12 & 13 tell how many bits are bad
 	for (i=0; i<1024; i++) bch[i] = 0;
 
-	for (int n=0; n<=20; n++)	// two errors in data
+	for (n=0; n<=20; n++)	// two errors in data
 	{
 		for (i=0; i<=20; i++)
 		{

diff --git a/PDW.cpp b/PDW.cpp
@@ -6881,7 +6881,7 @@ BOOL FAR PASCAL FilterDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam
 
 					while (index != CB_ERR)
 					{
-						Profile.filters.erase(&Profile.filters[index]);
+						Profile.filters.erase(Profile.filters.begin()+index);
 						ListView_DeleteItem(hListView, index) ;
 						index = ListView_GetNextItem(hListView, index-1, LVNI_SELECTED) ;
 						pumpMessages();	// Process messages
@@ -8402,7 +8402,7 @@ BOOL FAR PASCAL FilterEditDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lP
 				if (!bEditFilter)	// If we are adding a new filter
 				{
 					ListView_SetItemState(hListView, index++, 0, LVIS_SELECTED | LVIS_FOCUSED); // Deselect current
-					Profile.filters.insert(&Profile.filters[index], filter);
+					Profile.filters.insert(Profile.filters.begin() + index, filter);
 				}
 
 				if (strncmp(temp_cap, "Don't cha", 9))	// If not "Don't cha(nge)"
@@ -9882,7 +9882,8 @@ bool ReadFilters(char *szFilters, PPROFILE pProfile, bool bNew)
 						}
 						else break;
 					}
-					Profile.filters.insert(&Profile.filters[iFilter++], filter);
+					Profile.filters.insert(Profile.filters.begin() + iFilter, filter);
+					iFilter++;
 				}
 			}
 			if (bError) return(false);
@@ -10679,13 +10680,13 @@ void OnLButtonUp(UINT nFlags, int x, int y)
 		iRet = ListView_InsertItem(hListView, &lvi);
 
 		Copy_Filter_Fields(&filter, Profile.filters[iPos]);
-		Profile.filters.insert(&Profile.filters[lvhti.iItem], filter);
+		Profile.filters.insert(Profile.filters.begin() + lvhti.iItem, filter);
 
 		if (lvi.iItem < iPos)  lvhti.iItem++;
 		if (iRet <= iPos) iPos++;
 		// Delete from original position
 		ListView_DeleteItem(hListView, iPos);
-		Profile.filters.erase(&Profile.filters[iPos]);
+		Profile.filters.erase(Profile.filters.begin() + iPos);
 		iPos = ListView_GetNextItem(hListView, -1, LVNI_SELECTED);
 		nCopyStart = nCopyEnd = -1 ;
 	}
@@ -10833,8 +10834,8 @@ void SortFilter(HWND hDlg, bool bAddress)
 			Copy_Filter_Fields(&filter, Profile.filters[index]);
 			BuildFilterString(szTEMP, Profile.filters[index]);
 
-			Profile.filters.erase (&Profile.filters[index]);
-			Profile.filters.insert(&Profile.filters[i], filter);
+			Profile.filters.erase (Profile.filters.begin() + index);
+			Profile.filters.insert(Profile.filters.begin() + i, filter);
 			ListView_DeleteItem(hListView, index);
 			InsertListViewItem(szTEMP, i);
 
@@ -10921,7 +10922,7 @@ void PasteFilter(void)
 		{
  			Copy_Filter_Fields(&filter, Profile.filters[item]);
 			BuildFilterString(szTEMP, filter);
-			Profile.filters.insert(&Profile.filters[nIndex], filter);
+			Profile.filters.insert(Profile.filters.begin() + nIndex, filter);
 
 			if (nIndex <= nCopyStart)
 			{

diff --git a/ermes.cpp b/ermes.cpp
@@ -114,6 +114,7 @@ int ERMES::nOnes(int k)
 */
 int ERMES::lOnes(long int k)
 {
+	int kt;
 	for (int i=0, kt=0; i<32; i++)
 	{
 		if ((k & 0x0001l) != 0l) kt++;

diff --git a/helper_funcs.cpp b/helper_funcs.cpp
@@ -57,7 +57,8 @@ void GetFileNameWithoutExtension(char* filepath)
 	i=strrchr(filepath, '\\') - filepath+1;
 	j=strrchr(filepath, '.') - filepath;
 
-	for (int k=0; i<j; i++, k++)
+	int k=0;
+	for (k=0; i<j; i++, k++)
 	{
 		filepath[k]=filepath[i];
 	}

diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
@@ -0,0 +1,31 @@
+# CMakeLists.txt
+#
+# Build script for building with cmake (http://www.cmake.org)
+
+set( PDW_INCLUDES
+  ${PDW_INCLUDES}
+  ${CMAKE_CURRENT_SOURCE_DIR}/OSTYPE.H
+  ${CMAKE_CURRENT_SOURCE_DIR}/binary.h
+  #${CMAKE_CURRENT_SOURCE_DIR}/debug.h
+  #${CMAKE_CURRENT_SOURCE_DIR}/globals.h
+  #${CMAKE_CURRENT_SOURCE_DIR}/ipcnfg.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/rs232.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/smtp.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/smtp_int.h
+
+  PARENT_SCOPE
+)
+
+set( PDW_SRCS
+  ${PDW_SRCS}
+  ${CMAKE_CURRENT_SOURCE_DIR}/Debug.cpp
+  #${CMAKE_CURRENT_SOURCE_DIR}/OSTYPE.C
+  ${CMAKE_CURRENT_SOURCE_DIR}/Ostype.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/binary.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/ipcnfg.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/rs232.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/smtp.cpp
+
+  PARENT_SCOPE
+)
+