Update build scripts

FWGS · Jul 14, 2018 · 33f9fe8 · 33f9fe8
1 parent 863cf02
commit 33f9fe8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/contrib/mittorn/Makefile.linux b/contrib/mittorn/Makefile.linux
@@ -57,7 +57,11 @@ INCLUDES += -I/usr/include/SDL2 -Icommon -I../common -I. -I../pm_shared -Iclient
 DEFINES = -DUSE_SELECT -DCOLORIZE_CONSOLE -DDEBUGNAN -DXASH_FORCEINLINE -DGDB_BREAK
 
 # Specify commit hash in version string
+ifneq ($(XASH_RELEASE),1)
 DEFINES += -DXASH_BUILD_COMMIT=\"$(XASH_COMMIT)\"
+else
+DEFINES += -DXASH_RELEASE
+endif
 
 # Enable optimized crt functions for 32-bit systems
 ifneq ($(64BIT),1)
@@ -169,7 +173,7 @@ endif
 
 ifeq ($(XASH_DLL_LOADER),1)
 $(LOADER):
-	$(MAKE) -f ../loader/Makefile.linux -C ../loader $(LOADER)
+	$(MAKE) -f ../loader/Makefile.dllloader -C ../loader $(LOADER)
 	cp ../loader/$(LOADER) .
 endif
 

diff --git a/contrib/mittorn/Makefile.mingw b/contrib/mittorn/Makefile.mingw
@@ -81,8 +81,12 @@ endif
 #############################
 DEFINES += -DSINGLE_BINARY -DXASH_FORCEINLINE -DXASH_W32CON -DDBGHELP
 
+ifneq ($(XASH_RELEASE),1)
 # Specify commit hash in version string
 DEFINES += -DXASH_BUILD_COMMIT=\"$(XASH_COMMIT)\"
+else
+DEFINES += -DXASH_RELEASE
+endif
 
 # Enable optimized crt functions for 32-bit systems
 ifneq ($(64BIT),1)

diff --git a/ports/msvc6/build.bat b/ports/msvc6/build.bat
@@ -1,2 +1,2 @@
 set SDL_PATH=../SDL2-2.0.8
-cl -Dvsnprintf=_vsnprintf -o xash_sdl.dll /DEBUG /Zi /DLL /W3 /Gm /GD /G6 /LD /O2 /MD /O2 /D_USRDLL /DXASH_FORCEINLINE /DXASH_W32CON /DXASH_FASTSTR /D_WINDLL common\*.c client\*.c server\*.c client\vgui\*.c common\soundlib\*.c common\soundlib\libmpg\*.c common\imagelib\*.c platform\sdl\*.c platform\win32\*.c -I ../ports/msvc6/ -I %SDL_PATH%/include/ -Icommon -I../common -I. -I../pm_shared -Iclient -Iserver -Iclient/vgui -Icommon/sdl -DXASH_VGUI -DXASH_SDL -Dsnprintf=_snprintf -DDBGHELP /link /DLL /LIBPATH:..\ports\msvc6 user32.lib shell32.lib gdi32.lib msvcrt.lib winmm.lib /nodefaultlib:"libc.lib" /subsystem:windows %SDL_PATH%/lib/x86/SDL2.lib kernel32.lib winspool.lib comdlg32.lib advapi32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /DEBUG
+cl -Dvsnprintf=_vsnprintf -o xash_sdl.dll /DEBUG /Zi /DLL /W3 /Gm /GD /G6 /LD /O2 /MD /O2 /D_USRDLL %* /DXASH_FORCEINLINE /DXASH_W32CON /DXASH_FASTSTR /D_WINDLL common\*.c client\*.c server\*.c client\vgui\*.c common\soundlib\*.c common\soundlib\libmpg\*.c common\imagelib\*.c platform\sdl\*.c platform\win32\*.c -I ../ports/msvc6/ -I %SDL_PATH%/include/ -Icommon -I../common -I. -I../pm_shared -Iclient -Iserver -Iclient/vgui -Icommon/sdl -DXASH_VGUI -DXASH_SDL -Dsnprintf=_snprintf -DDBGHELP /link /DLL /LIBPATH:..\ports\msvc6 user32.lib shell32.lib gdi32.lib msvcrt.lib winmm.lib /nodefaultlib:"libc.lib" /subsystem:windows %SDL_PATH%/lib/x86/SDL2.lib kernel32.lib winspool.lib comdlg32.lib advapi32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /DEBUG %*