Source tree reorg, stage 2: finished renaming sc2code/ to uqm/; build files updated

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3214 8092fc87-c524-0410-9efc-e669fe64eaf9

sc2/ChangeLog

@@ -1,6 +1,6 @@
 Changes towards version 0.7:
 - Source tree reorg: libs/ moved out of sc2code/, msvc++/ moved to
-  build/msvc6/ - Coredev
+  build/msvc6/, src/sc2code/ renamed to src/uqm/ - Coredev
 - Druuge no longer turn hostile after attempting a salvage (bug #1013) - Alex
 - Process subtitles correctly with no timestamp file (bug #1060) - Alex
 - Lander will no longer hang when killed on planets with a lot of

sc2/Makeproject

@@ -16,7 +16,7 @@ case "$HOST_SYSTEM" in
 		uqm_NAME="$uqm_NAME.exe"
 		;;
 esac
-uqm_CFLAGS="$uqm_CFLAGS -Isrc -Isrc/sc2code"
+uqm_CFLAGS="$uqm_CFLAGS -Isrc -Isrc/uqm"
 if [ "$uqm_HAVE_REGEX" = 0 ]; then
 	uqm_CFLAGS="$uqm_CFLAGS -Isrc/regex"
 fi

sc2/build/msvc++/config.h

@@ -1,61 +0,0 @@
-/* This file contains some compile-time configuration options for MS Windows
- * systems when building using MSVC.
- * Change the values below if you want anything other than the defaults.
- * For *nix systems, config_unix.h is used, which is generated by build.sh
- * from src/config_unix.h.in.
- * When building on MS Windows using build.sh (MinGW, Cygwin),
- * config_win.h is generated from src/config_win.h.in.
- */
-
-#ifndef _CONFIG_H
-#define _CONFIG_H
-
-/* Directory where the UQM game data is located */
-#define CONTENTDIR "../content/"
-
-/* Directory where game data will be stored */
-//#define USERDIR "../userdata/"
-#define USERDIR "%APPDATA%/uqm/"
-
-/* Directory where config files will be stored */
-#define CONFIGDIR USERDIR
-
-/* Directory where supermelee teams will be stored */
-#define MELEEDIR "%UQM_CONFIG_DIR%/teams/"
-
-/* Directory where save games will be stored */
-#define SAVEDIR "%UQM_CONFIG_DIR%/save/"
-
-/* Define if words are stored with the most significant byte first */
-#undef WORDS_BIGENDIAN
-
-/* Defined if your system has readdir_r of its own */
-#undef HAVE_READDIR_R
-
-/* Defined if your system has setenv of its own */
-#undef HAVE_SETENV
-
-/* Defined if your system has strupr of its own */
-#define HAVE_STRUPR
-
-/* Defined if your system has strcasecmp of its own */
-#undef HAVE_STRCASECMP_UQM
-		// Not using "HAVE_STRCASECMP" as that conflicts with SDL.
-
-/* Defined if your system has stricmp of its own */
-#define HAVE_STRICMP
-
-/* Defined if your system has getopt_long */
-#undef HAVE_GETOPT_LONG
-
-/* Defined if your system has iswgraph of its own*/
-#define HAVE_ISWGRAPH
-
-/* Defined if your system has wchar_t of its own */
-#define HAVE_WCHAR_T
-
-/* Defined if your system has wint_t of its own */
-#define HAVE_WINT_T
-
-#endif /* _CONFIG_H */
-

sc2/src/Makeinfo

@@ -1,4 +1,4 @@
-uqm_SUBDIRS="sc2code libs res"
+uqm_SUBDIRS="libs res uqm"
 
 if [ "$uqm_HAVE_GETOPT_LONG" = 0 ]; then
 	uqm_SUBDIRS="$uqm_SUBDIRS getopt"
@@ -14,7 +14,7 @@ if [ "$uqm_HAVE_REGEX" = 0 ]; then
 	uqm_SUBDIRS="$uqm_SUBDIRS regex"
 fi
 
-uqm_CFILES="options.c port.c starcon2.c"
+uqm_CFILES="options.c port.c uqm.c"
 
 test_CFILES=test.c