Renamed nmake.mak to Makefile.win everywhere.
This commit is contained in:
parent
1becc0f29a
commit
8f9896038d
|
@ -21,7 +21,7 @@ SUBDIRS = \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
nmake.mak \
|
Makefile.win \
|
||||||
examples/synergy.conf \
|
examples/synergy.conf \
|
||||||
win32util/autodep.cpp \
|
win32util/autodep.cpp \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
# GNU General Public License for more details.
|
# GNU General Public License for more details.
|
||||||
|
|
||||||
# Name of this file for recursive make
|
# Name of this file for recursive make
|
||||||
MAKEFILE = nmake.mak
|
MAKEFILE = Makefile.win
|
||||||
|
|
||||||
# Default build is release is NODEBUG is defined, debug otherwise.
|
# Default build is release is NODEBUG is defined, debug otherwise.
|
||||||
!if !DEFINED(DEBUG)
|
!if !DEFINED(DEBUG)
|
|
@ -36,7 +36,7 @@ MSWINDOWS_SOURCE_FILES = \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
nmake.mak \
|
Makefile.win \
|
||||||
synergy.ico \
|
synergy.ico \
|
||||||
$(MSWINDOWS_SOURCE_FILES) \
|
$(MSWINDOWS_SOURCE_FILES) \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
|
@ -34,7 +34,7 @@ CARBON_SOURCE_FILES = \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
nmake.mak \
|
Makefile.win \
|
||||||
synergyc.ico \
|
synergyc.ico \
|
||||||
tb_error.ico \
|
tb_error.ico \
|
||||||
tb_idle.ico \
|
tb_idle.ico \
|
||||||
|
|
|
@ -34,7 +34,7 @@ CARBON_SOURCE_FILES = \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
nmake.mak \
|
Makefile.win \
|
||||||
synergys.ico \
|
synergys.ico \
|
||||||
tb_error.ico \
|
tb_error.ico \
|
||||||
tb_idle.ico \
|
tb_idle.ico \
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
NULL =
|
NULL =
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
nmake.mak \
|
Makefile.win \
|
||||||
synergy.nsi \
|
synergy.nsi \
|
||||||
dosify.c \
|
dosify.c \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
|
@ -59,7 +59,7 @@ so synergy can find the X11 includes and libraries.
|
||||||
search to find it.) It's necessary to run the file if you didn't have
|
search to find it.) It's necessary to run the file if you didn't have
|
||||||
the installer set up environment variables for you. Then enter:
|
the installer set up environment variables for you. Then enter:
|
||||||
<pre>
|
<pre>
|
||||||
nmake /nologo /f nmake.mak
|
nmake /nologo /f Makefile.win
|
||||||
</pre>
|
</pre>
|
||||||
This will build the programs into <span class="code">build\Release</span>.
|
This will build the programs into <span class="code">build\Release</span>.
|
||||||
</p>
|
</p>
|
||||||
|
@ -82,7 +82,7 @@ so synergy can find the X11 includes and libraries.
|
||||||
the Nullsoft Scriptable Install System. As in the building on Windows
|
the Nullsoft Scriptable Install System. As in the building on Windows
|
||||||
description above, enter:
|
description above, enter:
|
||||||
<pre>
|
<pre>
|
||||||
nmake /nologo /f nmake.mak installer
|
nmake /nologo /f Makefile.win installer
|
||||||
</pre>
|
</pre>
|
||||||
to build <span class="code">build\Release\SynergyInstaller.exe</span>. Run
|
to build <span class="code">build\Release\SynergyInstaller.exe</span>. Run
|
||||||
this to install synergy.
|
this to install synergy.
|
||||||
|
|
|
@ -90,7 +90,7 @@ WIN32_SOURCE_FILES = \
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
CMultibyte.cpp \
|
CMultibyte.cpp \
|
||||||
nmake.mak \
|
Makefile.win \
|
||||||
vsnprintf.cpp \
|
vsnprintf.cpp \
|
||||||
$(UNIX_SOURCE_FILES) \
|
$(UNIX_SOURCE_FILES) \
|
||||||
$(WIN32_SOURCE_FILES) \
|
$(WIN32_SOURCE_FILES) \
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
NULL =
|
NULL =
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
nmake.mak \
|
Makefile.win \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
MAINTAINERCLEANFILES = \
|
MAINTAINERCLEANFILES = \
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
NULL =
|
NULL =
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
nmake.mak \
|
Makefile.win \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
MAINTAINERCLEANFILES = \
|
MAINTAINERCLEANFILES = \
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
NULL =
|
NULL =
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
nmake.mak \
|
Makefile.win \
|
||||||
BasicTypes.h \
|
BasicTypes.h \
|
||||||
IInterface.h \
|
IInterface.h \
|
||||||
MacOSXPrecomp.h \
|
MacOSXPrecomp.h \
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
NULL =
|
NULL =
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
nmake.mak \
|
Makefile.win \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
MAINTAINERCLEANFILES = \
|
MAINTAINERCLEANFILES = \
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
NULL =
|
NULL =
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
nmake.mak \
|
Makefile.win \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
MAINTAINERCLEANFILES = \
|
MAINTAINERCLEANFILES = \
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
NULL =
|
NULL =
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
nmake.mak \
|
Makefile.win \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
MAINTAINERCLEANFILES = \
|
MAINTAINERCLEANFILES = \
|
||||||
|
|
|
@ -92,7 +92,7 @@ CARBON_SOURCE_FILES = \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
nmake.mak \
|
Makefile.win \
|
||||||
$(XWINDOWS_SOURCE_FILES) \
|
$(XWINDOWS_SOURCE_FILES) \
|
||||||
$(MSWINDOWS_SOURCE_FILES) \
|
$(MSWINDOWS_SOURCE_FILES) \
|
||||||
$(MSWINDOWS_HOOK_SOURCE_FILES) \
|
$(MSWINDOWS_HOOK_SOURCE_FILES) \
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
NULL =
|
NULL =
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
nmake.mak \
|
Makefile.win \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
MAINTAINERCLEANFILES = \
|
MAINTAINERCLEANFILES = \
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
NULL =
|
NULL =
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
nmake.mak \
|
Makefile.win \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
MAINTAINERCLEANFILES = \
|
MAINTAINERCLEANFILES = \
|
||||||
|
|
Loading…
Reference in New Issue