Permalink
Browse files

Fix some build problems due to removed components

  • Loading branch information...
1 parent f549fb5 commit a9c3756bc361351db90e82d149acb7d9e4425a77 @Meridian59 committed Sep 16, 2012
Showing with 165 additions and 16 deletions.
  1. +161 −0 .gitignore
  2. +1 −1 clientd3d/client.h
  3. +3 −15 makefile
View
@@ -0,0 +1,161 @@
+#################
+## Eclipse
+#################
+
+*.pydevproject
+.project
+.metadata
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.classpath
+.settings/
+.loadpath
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# PDT-specific
+.buildpath
+
+
+#################
+## Visual Studio
+#################
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+# Build results
+[Dd]ebug/
+[Rr]elease/
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.vspscc
+.builds
+*.dotCover
+
+## TODO: If you have NuGet Package Restore enabled, uncomment this
+#packages/
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+
+# Visual Studio profiler
+*.psess
+*.vsp
+
+# ReSharper is a .NET coding add-in
+_ReSharper*
+
+# Installshield output folder
+[Ee]xpress
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish
+
+# Others
+[Bb]in
+[Oo]bj
+sql
+TestResults
+*.Cache
+ClientBin
+stylecop.*
+~$*
+*.dbmdl
+Generated_Code #added for RIA/Silverlight projects
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+
+
+
+############
+## Windows
+############
+
+# Windows image file caches
+Thumbs.db
+
+# Folder config file
+Desktop.ini
+
+
+#############
+## Python
+#############
+
+*.py[co]
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+parts
+var
+sdist
+develop-eggs
+.installed.cfg
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
+.coverage
+.tox
+
+#Translations
+*.mo
+
+#Mr Developer
+.mr.developer.cfg
+
+# Mac crap
+.DS_Store
View
@@ -85,7 +85,7 @@ extern "C" {
// Use this #define to enable Miles Sound System version. If not defined,
// music is played through the default MIDI player, and sound goes through the
// ancient wavemix DLL.
-#define M59_MSS
+//#define M59_MSS
#ifdef M59_MSS
View
@@ -8,15 +8,15 @@ TOPDIR=.
.SILENT:
# make ignores targets if they match directory names
-all: Bserver Bclient Bmodules Bcompiler Bdiff Bkod Bdeco Bmakebgf Bcrusher Bsprocket Butil Bupdater Bbbgun Bkeybind
+all: Bserver Bclient Bmodules Bcompiler Bdiff Bkod Bdeco Bmakebgf Bsprocket Butil Bupdater Bbbgun Bkeybind
-Bserver: Bcrusher Bsprocket
+Bserver: Bsprocket
echo Making in $(BLAKSERVDIR)
cd $(BLAKSERVDIR)
$(MAKE) /$(MAKEFLAGS) $(COMMAND)
cd ..
-Bclient: Butil Bcrusher Bwavemix
+Bclient: Butil
echo Making in $(CLIENTDIR)
cd $(CLIENTDIR)
$(MAKE) /$(MAKEFLAGS) $(COMMAND)
@@ -28,12 +28,6 @@ Bmodules: Bclient
$(MAKE) /$(MAKEFLAGS) $(COMMAND)
cd ..
-Bwavemix:
- echo Making in $(WAVEMIXDIR)
- cd $(WAVEMIXDIR)
- $(MAKE) /$(MAKEFLAGS) $(COMMAND)
- cd ..
-
Bcompiler:
echo Making $(COMMAND) in $(BLAKCOMPDIR)
cd $(BLAKCOMPDIR)
@@ -76,12 +70,6 @@ Butil:
$(MAKE) /$(MAKEFLAGS) $(COMMAND)
cd ..
-Bcrusher:
- echo Making $(COMMAND) in $(CRUSHERDIR)
- cd $(CRUSHERDIR)
- $(MAKE) /$(MAKEFLAGS) $(COMMAND)
- cd ..
-
Bsprocket:
echo Making $(COMMAND) in $(SPROCKETDIR)
cd $(SPROCKETDIR)

0 comments on commit a9c3756

Please sign in to comment.