Skip to content

Commit

Permalink
Remove MSVC project files.
Browse files Browse the repository at this point in the history
  • Loading branch information
jtv committed Dec 20, 2019
1 parent 23deb69 commit 7562857
Show file tree
Hide file tree
Showing 23 changed files with 9 additions and 2,380 deletions.
File renamed without changes.
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SUBDIRS = include src test tools win32 config doc
SUBDIRS = include src test tools config doc
EXTRA_DIST = autogen.sh configitems README.md README-UPGRADE VERSION

MAINTAINERCLEANFILES = \
Expand Down
2 changes: 1 addition & 1 deletion Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
with_postgres_include = @with_postgres_include@
with_postgres_lib = @with_postgres_lib@
SUBDIRS = include src test tools win32 config doc
SUBDIRS = include src test tools config doc
EXTRA_DIST = autogen.sh configitems README.md README-UPGRADE VERSION
MAINTAINERCLEANFILES = \
Makefile.in aclocal.m4 config.h.in config.log configure stamp-h.in
Expand Down
2 changes: 2 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
- win32/libpqxx.cxx and DllMain did not seem to be needed, so they're gone.
- Large objects now require backend version 9.3 or better.
- Seeking inside large objects now supports 64-bit sizes.
- Visual Studio project files and sample headers are gone. Use CMake.
- MinGW Makefiles are gone. Use `configure` or CMake.
6.4.4
- Use pkg-config if pg-config is not available.
- In CMake build, prefer CMake's config headers over any found in source tree.
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Apple macOS and the BSD family, AIX, HP-UX, Irix, Solaris, etc. Even on
Microsoft Windows, a Unix-like environment such as Cygwin or MinGW installed
should work.

For any Windows builds though, also see win32/INSTALL.txt.
For any Windows builds though, also see INSTALL-Windows.md.


### Using CMake
Expand Down Expand Up @@ -160,7 +160,7 @@ that you wish to build a libpqxx based on the postgres version found in
/home/me/postgres.

If you're running `configure` on a Windows system, make sure that the linker
can find `ws2_32.lib`. See the note in win32/INSTALL.txt.
can find `ws2_32.lib`. See the note in INSTALL-Windows.md.


#### 2. Make
Expand Down
6 changes: 0 additions & 6 deletions autogen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,6 @@ expand_templates() {
do
./tools/template2mak.py "$template" "${template%.template}"
done

# Ensure CR/LF line endings for the Windows files we generate.
for template in win32/*.mak.template
do
sed "${template%.template}" -i -e 's/\r*$/\r/'
done
}


Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

3 changes: 1 addition & 2 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -19282,7 +19282,7 @@ $as_echo "no" >&6; }
fi


ac_config_files="$ac_config_files Makefile config/Makefile doc/Makefile doc/Doxyfile src/Makefile test/Makefile test/unit/Makefile tools/Makefile win32/Makefile include/Makefile include/pqxx/Makefile libpqxx.pc"
ac_config_files="$ac_config_files Makefile config/Makefile doc/Makefile doc/Doxyfile src/Makefile test/Makefile test/unit/Makefile tools/Makefile include/Makefile include/pqxx/Makefile libpqxx.pc"



Expand Down Expand Up @@ -20422,7 +20422,6 @@ do
"test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
"test/unit/Makefile") CONFIG_FILES="$CONFIG_FILES test/unit/Makefile" ;;
"tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
"win32/Makefile") CONFIG_FILES="$CONFIG_FILES win32/Makefile" ;;
"include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
"include/pqxx/Makefile") CONFIG_FILES="$CONFIG_FILES include/pqxx/Makefile" ;;
"libpqxx.pc") CONFIG_FILES="$CONFIG_FILES libpqxx.pc" ;;
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -507,8 +507,8 @@ AC_PROG_MAKE_SET

AC_CONFIG_FILES([
Makefile config/Makefile doc/Makefile doc/Doxyfile src/Makefile
test/Makefile test/unit/Makefile tools/Makefile win32/Makefile
include/Makefile include/pqxx/Makefile libpqxx.pc])
test/Makefile test/unit/Makefile tools/Makefile include/Makefile
include/pqxx/Makefile libpqxx.pc])


AC_CONFIG_COMMANDS([configitems], ["${srcdir}/tools/splitconfig" "${srcdir}"])
Expand Down
12 changes: 0 additions & 12 deletions win32/Makefile.am

This file was deleted.

Loading

0 comments on commit 7562857

Please sign in to comment.