makefile and build script cleanup
This commit is contained in:
		
							parent
							
								
									68473901ec
								
							
						
					
					
						commit
						4514516712
					
				
					 5 changed files with 19 additions and 15 deletions
				
			
		| 
						 | 
					@ -25,9 +25,6 @@ echo DEV = %DEV_64% > makeinc.mak
 | 
				
			||||||
echo X64 = YES >> makeinc.mak
 | 
					echo X64 = YES >> makeinc.mak
 | 
				
			||||||
type makeinc.skel.mak >> makeinc.mak
 | 
					type makeinc.skel.mak >> makeinc.mak
 | 
				
			||||||
nmake /nologo /f makefile.mak clean
 | 
					nmake /nologo /f makefile.mak clean
 | 
				
			||||||
cd pixmaps
 | 
					 | 
				
			||||||
nmake /nologo /f makefile.mak
 | 
					 | 
				
			||||||
cd ..
 | 
					 | 
				
			||||||
nmake /nologo /f makefile.mak
 | 
					nmake /nologo /f makefile.mak
 | 
				
			||||||
cd ..\plugins
 | 
					cd ..\plugins
 | 
				
			||||||
nmake /nologo /f makefile.mak clean
 | 
					nmake /nologo /f makefile.mak clean
 | 
				
			||||||
| 
						 | 
					@ -44,3 +41,4 @@ cd ..\..\build
 | 
				
			||||||
call compile-po-files.bat
 | 
					call compile-po-files.bat
 | 
				
			||||||
set PATH=%OPATH%
 | 
					set PATH=%OPATH%
 | 
				
			||||||
call release-x64.bat
 | 
					call release-x64.bat
 | 
				
			||||||
 | 
					pause
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -24,9 +24,6 @@ cd src
 | 
				
			||||||
echo DEV = %DEV_32% > makeinc.mak
 | 
					echo DEV = %DEV_32% > makeinc.mak
 | 
				
			||||||
type makeinc.skel.mak >> makeinc.mak
 | 
					type makeinc.skel.mak >> makeinc.mak
 | 
				
			||||||
nmake /nologo /f makefile.mak clean
 | 
					nmake /nologo /f makefile.mak clean
 | 
				
			||||||
cd pixmaps
 | 
					 | 
				
			||||||
nmake /nologo /f makefile.mak
 | 
					 | 
				
			||||||
cd ..
 | 
					 | 
				
			||||||
nmake /nologo /f makefile.mak
 | 
					nmake /nologo /f makefile.mak
 | 
				
			||||||
cd ..\plugins
 | 
					cd ..\plugins
 | 
				
			||||||
nmake /nologo /f makefile.mak clean
 | 
					nmake /nologo /f makefile.mak clean
 | 
				
			||||||
| 
						 | 
					@ -43,3 +40,4 @@ cd ..\..\build
 | 
				
			||||||
call compile-po-files.bat
 | 
					call compile-po-files.bat
 | 
				
			||||||
set PATH=%OPATH%
 | 
					set PATH=%OPATH%
 | 
				
			||||||
call release-x86.bat
 | 
					call release-x86.bat
 | 
				
			||||||
 | 
					pause
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -7,6 +7,7 @@ echo 2> portable-mode
 | 
				
			||||||
move portable-mode %XCHAT_DEST%
 | 
					move portable-mode %XCHAT_DEST%
 | 
				
			||||||
copy ..\src\fe-gtk\xchat.exe %XCHAT_DEST%
 | 
					copy ..\src\fe-gtk\xchat.exe %XCHAT_DEST%
 | 
				
			||||||
copy ..\src\fe-text\xchat-text.exe %XCHAT_DEST%
 | 
					copy ..\src\fe-text\xchat-text.exe %XCHAT_DEST%
 | 
				
			||||||
 | 
					copy ..\src\gtk2-prefs\gtk2-prefs.exe %XCHAT_DEST%
 | 
				
			||||||
copy %DEPS_ROOT%\bin\libatk-1.0-0.dll %XCHAT_DEST%
 | 
					copy %DEPS_ROOT%\bin\libatk-1.0-0.dll %XCHAT_DEST%
 | 
				
			||||||
copy %DEPS_ROOT%\bin\libcairo-2.dll %XCHAT_DEST%
 | 
					copy %DEPS_ROOT%\bin\libcairo-2.dll %XCHAT_DEST%
 | 
				
			||||||
copy %DEPS_ROOT%\bin\libexpat-1.dll %XCHAT_DEST%
 | 
					copy %DEPS_ROOT%\bin\libexpat-1.dll %XCHAT_DEST%
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -7,6 +7,7 @@ echo 2> portable-mode
 | 
				
			||||||
move portable-mode %XCHAT_DEST%
 | 
					move portable-mode %XCHAT_DEST%
 | 
				
			||||||
copy ..\src\fe-gtk\xchat.exe %XCHAT_DEST%
 | 
					copy ..\src\fe-gtk\xchat.exe %XCHAT_DEST%
 | 
				
			||||||
copy ..\src\fe-text\xchat-text.exe %XCHAT_DEST%
 | 
					copy ..\src\fe-text\xchat-text.exe %XCHAT_DEST%
 | 
				
			||||||
 | 
					copy ..\src\gtk2-prefs\gtk2-prefs.exe %XCHAT_DEST%
 | 
				
			||||||
copy %DEPS_ROOT%\bin\libatk-1.0-0.dll %XCHAT_DEST%
 | 
					copy %DEPS_ROOT%\bin\libatk-1.0-0.dll %XCHAT_DEST%
 | 
				
			||||||
copy %DEPS_ROOT%\bin\libcairo-2.dll %XCHAT_DEST%
 | 
					copy %DEPS_ROOT%\bin\libcairo-2.dll %XCHAT_DEST%
 | 
				
			||||||
copy %DEPS_ROOT%\bin\libexpat-1.dll %XCHAT_DEST%
 | 
					copy %DEPS_ROOT%\bin\libexpat-1.dll %XCHAT_DEST%
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,17 +1,23 @@
 | 
				
			||||||
all:
 | 
					all:
 | 
				
			||||||
	@cd common
 | 
						@cd pixmaps
 | 
				
			||||||
 | 
						@-$(MAKE) /nologo /s /f makefile.mak $@
 | 
				
			||||||
 | 
						@cd ..\common
 | 
				
			||||||
	@-$(MAKE) /nologo /s /f makefile.mak $@
 | 
						@-$(MAKE) /nologo /s /f makefile.mak $@
 | 
				
			||||||
	@cd ..\fe-gtk
 | 
						@cd ..\fe-gtk
 | 
				
			||||||
	@-$(MAKE) /nologo /s /f makefile.mak $@
 | 
						@-$(MAKE) /nologo /s /f makefile.mak $@
 | 
				
			||||||
	@cd ..\fe-text
 | 
						@cd ..\fe-text
 | 
				
			||||||
	@-$(MAKE) /nologo /s /f makefile.mak $@
 | 
						@-$(MAKE) /nologo /s /f makefile.mak $@
 | 
				
			||||||
 | 
						@cd ..\gtk2-prefs
 | 
				
			||||||
 | 
						@-$(MAKE) /nologo /s /f makefile.mak $@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
clean:
 | 
					clean:
 | 
				
			||||||
	@del common\*.obj
 | 
						@cd pixmaps
 | 
				
			||||||
	@del common\xchatcommon.lib
 | 
						@-$(MAKE) /nologo /s /f makefile.mak clean $@
 | 
				
			||||||
	@del fe-gtk\*.obj
 | 
						@cd ..\common
 | 
				
			||||||
	@del fe-gtk\xchat.exe
 | 
						@-$(MAKE) /nologo /s /f makefile.mak clean $@
 | 
				
			||||||
	@del fe-gtk\xchat.res
 | 
						@cd ..\fe-gtk
 | 
				
			||||||
	@del fe-text\*.obj
 | 
						@-$(MAKE) /nologo /s /f makefile.mak clean $@
 | 
				
			||||||
	@del fe-text\xchat-text.exe
 | 
						@cd ..\fe-text
 | 
				
			||||||
	@del pixmaps\*.h
 | 
						@-$(MAKE) /nologo /s /f makefile.mak clean $@
 | 
				
			||||||
 | 
						@cd ..\gtk2-prefs
 | 
				
			||||||
 | 
						@-$(MAKE) /nologo /s /f makefile.mak clean $@
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		
		Reference in a new issue