Author: cazfi
Date: Wed Aug  3 22:04:29 2016
New Revision: 33448

URL: http://svn.gna.org/viewcvs/freeciv?rev=33448&view=rev
Log:
Renamed win32/ directory as windows/

See patch #7524

Added:
    trunk/windows/
      - copied from r33447, trunk/win32/
Removed:
    trunk/win32/
Modified:
    trunk/Makefile.am
    trunk/client/Makefile.am
    trunk/configure.ac
    trunk/server/Makefile.am
    trunk/tools/Makefile.am

Modified: trunk/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/Makefile.am?rev=33448&r1=33447&r2=33448&view=diff
==============================================================================
--- trunk/Makefile.am   (original)
+++ trunk/Makefile.am   Wed Aug  3 22:04:29 2016
@@ -25,7 +25,7 @@
 DSUBDIRS =
 endif
 
-SUBDIRS = $(DSUBDIRS) dependencies utility common tests win32 $(SSUBDIRS) 
$(CSUBDIRS) translations doc tools gen_headers lua bootstrap
+SUBDIRS = $(DSUBDIRS) dependencies utility common tests windows $(SSUBDIRS) 
$(CSUBDIRS) translations doc tools gen_headers lua bootstrap
 
 ## Automake should distribute config.rpath automatically - and new
 ## versions probably do. We still support versions that do not, so

Modified: trunk/client/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/Makefile.am?rev=33448&r1=33447&r2=33448&view=diff
==============================================================================
--- trunk/client/Makefile.am    (original)
+++ trunk/client/Makefile.am    Wed Aug  3 22:04:29 2016
@@ -51,7 +51,7 @@
 endif
 
 if MINGW
-CLIENTICON=../win32/clienticon.o
+CLIENTICON=../windows/clienticon.o
 endif
 
 EXTRA_DIST= $(ALL_AUDIO_SDL_FILES)

Modified: trunk/configure.ac
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=33448&r1=33447&r2=33448&view=diff
==============================================================================
--- trunk/configure.ac  (original)
+++ trunk/configure.ac  Wed Aug  3 22:04:29 2016
@@ -1742,7 +1742,7 @@
           ai/threaded/Makefile
           ai/threxpr/Makefile
          tests/Makefile
-         win32/Makefile
+         windows/Makefile
          client/Makefile
          client/agents/Makefile
          client/include/Makefile

Modified: trunk/server/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/Makefile.am?rev=33448&r1=33447&r2=33448&view=diff
==============================================================================
--- trunk/server/Makefile.am    (original)
+++ trunk/server/Makefile.am    Wed Aug  3 22:04:29 2016
@@ -28,7 +28,7 @@
        $(FCDB_MYSQL_CFLAGS) $(FCDB_POSTGRES_CFLAGS) $(FCDB_SQLITE3_CFLAGS)
 
 if MINGW
-SERVERICON=../win32/servericon.o
+SERVERICON=../windows/servericon.o
 endif
 
 exe_sources = \

Modified: trunk/tools/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/tools/Makefile.am?rev=33448&r1=33447&r2=33448&view=diff
==============================================================================
--- trunk/tools/Makefile.am     (original)
+++ trunk/tools/Makefile.am     Wed Aug  3 22:04:29 2016
@@ -54,7 +54,7 @@
 AM_CPPFLAGS = $(common_cppflags)
 
 if MINGW
-MPICON = $(top_builddir)/win32/mpicon.o
+MPICON = $(top_builddir)/windows/mpicon.o
 else
 desktopfiledir = @DESKTOPDIR@
 desktopfile_DATA =


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to