build DSPSpy for gc (make -f MakefileGC) - needs web server or something for easy result viewing :p

Remove the sort on the netplay gamelist... tatsunoko vs. capcom appears as ???? vs. capcom, so it was being sorted to the top and screwing up the index. To do it "correctly" you'd need to assign the index to the item's arbitrary data.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3226 8ced0084-cf51-0410-be5f-012b33b47a6e

4 files changed, 190 insertions, 35 deletions

diff --git a/Source/Core/DolphinWX/Src/NetWindow.cpp b/Source/Core/DolphinWX/Src/NetWindow.cpp
index f55098f422..bc1315fc14 100644
--- a/Source/Core/DolphinWX/Src/NetWindow.cpp
+++ b/Source/Core/DolphinWX/Src/NetWindow.cpp
@@ -177,7 +177,7 @@ void NetPlay::DrawGUI()
 	m_SetPort = new wxTextCtrl(m_Tab_Host, ID_SETPORT, wxT("12345"), wxDefaultPosition, wxDefaultSize, 0);

 	m_GameList_text = new wxStaticText(m_Tab_Host, ID_GAMELIST_TXT, wxT("Warning: Use a forwarded port ! Select Game and press Host :"), wxDefaultPosition, wxDefaultSize);

 	m_GameList = new wxListBox(m_Tab_Host, ID_GAMELIST, wxDefaultPosition, wxDefaultSize,

-				m_GameList_str, wxLB_SINGLE | wxLB_SORT | wxLB_NEEDED_SB);

+		m_GameList_str, wxLB_SINGLE | wxLB_NEEDED_SB);

 	m_HostGame = new wxButton(m_Tab_Host, ID_BUTTON_HOST, wxT("Host"), wxDefaultPosition, wxDefaultSize);

 

 	// Sizers HOST

diff --git a/Source/DSPSpy/DSPSpy.vcproj b/Source/DSPSpy/DSPSpy.vcproj
index c109cc362c..ce4e2fc9e8 100644
--- a/Source/DSPSpy/DSPSpy.vcproj
+++ b/Source/DSPSpy/DSPSpy.vcproj
@@ -19,20 +19,22 @@
 	</ToolFiles>

 	<Configurations>

 		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			Name="Wii|x64"

+			OutputDirectory="build"

+			IntermediateDirectory="build"

 			ConfigurationType="0"

 			CharacterSet="2"

+			WholeProgramOptimization="1"

+			BuildLogFile="build\BuildLog.htm"

 			>

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="..\..\Binary\$(PlatformName)\DSPToolD.exe -h dsp_code tests\dsp_code.ds&#x0D;&#x0A;make&#x0D;&#x0A;"

-				ReBuildCommandLine="make clean&#x0D;&#x0A;..\..\Binary\$(PlatformName)\DSPToolD.exe -h dsp_code tests\dsp_code.ds&#x0D;&#x0A;make"

+				BuildCommandLine="..\..\Binary\$(PlatformName)\DSPTool.exe -h dsp_code tests\dsp_test.ds&#x0D;&#x0A;make&#x0D;&#x0A;"

+				ReBuildCommandLine="make clean&#x0D;&#x0A;..\..\Binary\$(PlatformName)\DSPTool.exe -h dsp_code tests\dsp_code.ds&#x0D;&#x0A;make"

 				CleanCommandLine="make clean"

-				Output=""

+				Output="DSPSpy.dol"

 				PreprocessorDefinitions=""

-				IncludeSearchPath=""

+				IncludeSearchPath="$(ProjectDir);C:\devkitPro\libogc\include"

 				ForcedIncludes=""

 				AssemblySearchPath=""

 				ForcedUsingAssemblies=""

@@ -40,20 +42,22 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			Name="GC|x64"

+			OutputDirectory="build"

+			IntermediateDirectory="build"

 			ConfigurationType="0"

 			CharacterSet="2"

+			WholeProgramOptimization="1"

+			BuildLogFile="build\BuildLogGC.htm"

 			>

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="..\..\Binary\$(PlatformName)\DSPToolD.exe -h dsp_code tests\dsp_code.ds&#x0D;&#x0A;make&#x0D;&#x0A;"

-				ReBuildCommandLine="make clean&#x0D;&#x0A;..\..\Binary\$(PlatformName)\DSPToolD.exe -h dsp_code tests\dsp_code.ds&#x0D;&#x0A;make"

+				BuildCommandLine="..\..\Binary\$(PlatformName)\DSPTool.exe -h dsp_code tests\dsp_test.ds&#x0D;&#x0A;make -f MakefileGC"

+				ReBuildCommandLine="make clean&#x0D;&#x0A;..\..\Binary\$(PlatformName)\DSPTool.exe -h dsp_code tests\dsp_code.ds&#x0D;&#x0A;make -f MakefileGC"

 				CleanCommandLine="make clean"

-				Output=""

+				Output="DSPSpyGC.dol"

 				PreprocessorDefinitions=""

-				IncludeSearchPath=""

+				IncludeSearchPath="$(ProjectDir);C:\devkitPro\libogc\include"

 				ForcedIncludes=""

 				AssemblySearchPath=""

 				ForcedUsingAssemblies=""

@@ -61,21 +65,22 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			Name="Wii|Win32"

+			OutputDirectory="build"

+			IntermediateDirectory="build"

 			ConfigurationType="0"

 			CharacterSet="2"

 			WholeProgramOptimization="1"

+			BuildLogFile="build\BuildLog.htm"

 			>

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="..\..\Binary\$(PlatformName)\DSPTool.exe -h dsp_code tests\dsp_code.ds&#x0D;&#x0A;make&#x0D;&#x0A;"

+				BuildCommandLine="..\..\Binary\$(PlatformName)\DSPTool.exe -h dsp_code tests\dsp_test.ds&#x0D;&#x0A;make&#x0D;&#x0A;"

 				ReBuildCommandLine="make clean&#x0D;&#x0A;..\..\Binary\$(PlatformName)\DSPTool.exe -h dsp_code tests\dsp_code.ds&#x0D;&#x0A;make"

 				CleanCommandLine="make clean"

 				Output="DSPSpy.dol"

 				PreprocessorDefinitions=""

-				IncludeSearchPath=""

+				IncludeSearchPath="$(ProjectDir);C:\devkitPro\libogc\include"

 				ForcedIncludes=""

 				AssemblySearchPath=""

 				ForcedUsingAssemblies=""

@@ -83,21 +88,22 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release|x64"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			Name="GC|Win32"

+			OutputDirectory="build"

+			IntermediateDirectory="build"

 			ConfigurationType="0"

 			CharacterSet="2"

 			WholeProgramOptimization="1"

+			BuildLogFile="build\BuildLogGC.htm"

 			>

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="..\..\Binary\$(PlatformName)\DSPTool.exe -h dsp_code tests\dsp_test.ds&#x0D;&#x0A;make&#x0D;&#x0A;"

-				ReBuildCommandLine="make clean&#x0D;&#x0A;..\..\Binary\$(PlatformName)\DSPTool.exe -h dsp_code tests\dsp_test.ds&#x0D;&#x0A;make"

+				BuildCommandLine="..\..\Binary\$(PlatformName)\DSPTool.exe -h dsp_code tests\dsp_test.ds&#x0D;&#x0A;make -f MakefileGC"

+				ReBuildCommandLine="make clean&#x0D;&#x0A;..\..\Binary\$(PlatformName)\DSPTool.exe -h dsp_code tests\dsp_code.ds&#x0D;&#x0A;make -f MakefileGC"

 				CleanCommandLine="make clean"

-				Output="DSPSpy.dol"

+				Output="DSPSpyGC.dol"

 				PreprocessorDefinitions=""

-				IncludeSearchPath=""

+				IncludeSearchPath="$(ProjectDir);C:\devkitPro\libogc\include"

 				ForcedIncludes=""

 				AssemblySearchPath=""

 				ForcedUsingAssemblies=""

@@ -149,6 +155,10 @@
 			>

 		</File>

 		<File

+			RelativePath=".\MakefileGC"

+			>

+		</File>

+		<File

 			RelativePath=".\mem_dump.h"

 			>

 		</File>

diff --git a/Source/DSPSpy/MakefileGC b/Source/DSPSpy/MakefileGC
new file mode 100644
index 0000000000..279b639114
--- /dev/null
+++ b/Source/DSPSpy/MakefileGC
@@ -0,0 +1,145 @@
+#---------------------------------------------------------------------------------

+# Clear the implicit built in rules

+#---------------------------------------------------------------------------------

+.SUFFIXES:

+#---------------------------------------------------------------------------------

+ifeq ($(strip $(DEVKITPPC)),)

+$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC")

+endif

+

+include $(DEVKITPPC)/gamecube_rules

+

+#---------------------------------------------------------------------------------

+# TARGET is the name of the output

+# BUILD is the directory where object files & intermediate files will be placed

+# SOURCES is a list of directories containing source code

+# INCLUDES is a list of directories containing extra header files

+#---------------------------------------------------------------------------------

+TARGET		:=	$(notdir $(CURDIR))GC

+BUILD		:=	build

+SOURCES		:=	. emu

+RESOURCES	:=	../resources

+DATA		:=	data

+INCLUDES	:=	include ../Core/Common/Src .

+

+#---------------------------------------------------------------------------------

+# options for code generation

+#---------------------------------------------------------------------------------

+

+CFLAGS	= -save-temps -O2 -Wall --no-strict-aliasing $(MACHDEP) $(INCLUDE)

+CXXFLAGS	=	$(CFLAGS)

+

+LDFLAGS	=	-g $(MACHDEP) -Wl,-Map,$(notdir $@).map

+

+#---------------------------------------------------------------------------------

+# any extra libraries we wish to link with the project

+#---------------------------------------------------------------------------------

+LIBS	:=	-lfat -lasnd -lmodplay -lz -logc -lm

+

+#---------------------------------------------------------------------------------

+# list of directories containing libraries, this must be the top level containing

+# include and lib

+#---------------------------------------------------------------------------------

+LIBDIRS	:=

+

+#---------------------------------------------------------------------------------

+# no real need to edit anything past this point unless you need to add additional

+# rules for different file extensions

+#---------------------------------------------------------------------------------

+ifneq ($(BUILD),$(notdir $(CURDIR)))

+#---------------------------------------------------------------------------------

+

+export OUTPUT	:=	$(CURDIR)/$(TARGET)

+

+export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) $(foreach dir,$(RESOURCES),$(CURDIR)/$(dir))\

+					$(foreach dir,$(DATA),$(CURDIR)/$(dir))

+

+export DEPSDIR	:=	$(CURDIR)/$(BUILD)

+

+#---------------------------------------------------------------------------------

+# automatically build a list of object files for our project

+#---------------------------------------------------------------------------------

+CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))

+CFILES		+=	$(foreach dir,$(RESOURCES),$(notdir $(wildcard $(dir)/*.c)))

+CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))

+sFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))

+SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.S)))

+BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))

+

+

+#---------------------------------------------------------------------------------

+# use CXX for linking C++ projects, CC for standard C

+#---------------------------------------------------------------------------------

+ifeq ($(strip $(CPPFILES)),)

+	export LD	:=	$(CC)

+else

+	export LD	:=	$(CXX)

+endif

+

+export OFILES	:=	$(addsuffix .o,$(BINFILES)) \

+					$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) \

+					$(sFILES:.s=.o) $(SFILES:.S=.o)

+

+#---------------------------------------------------------------------------------

+# build a list of include paths

+#---------------------------------------------------------------------------------

+export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \

+					$(foreach dir,$(LIBDIRS),-I$(dir)/include) \

+					-I$(CURDIR)/$(BUILD) \

+					-I$(LIBOGC_INC)

+

+#---------------------------------------------------------------------------------

+# build a list of library paths

+#---------------------------------------------------------------------------------

+export LIBPATHS	:=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib) \

+					-L$(LIBOGC_LIB)

+

+export OUTPUT	:=	$(CURDIR)/$(TARGET)

+.PHONY: $(BUILD) clean

+

+#---------------------------------------------------------------------------------

+$(BUILD):

+	@[ -d $@ ] || mkdir -p $@

+	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile

+

+#---------------------------------------------------------------------------------

+clean:

+	@echo clean ...

+	@rm -fr $(BUILD) $(OUTPUT).elf $(OUTPUT).dol

+#---------------------------------------------------------------------------------

+run:

+	PSOload $(OUTPUT).dol

+

+#---------------------------------------------------------------------------------

+else

+

+DEPENDS	:=	$(OFILES:.o=.d)

+

+#%.biz: %.ds

+#	gcdsptool -c $< -o $@

+

+#%.h: %.biz

+#	raw2c $< $@

+

+#---------------------------------------------------------------------------------

+# main targets

+#---------------------------------------------------------------------------------

+$(OUTPUT).dol: $(OUTPUT).elf

+$(OUTPUT).elf: $(OFILES) 

+

+

+#---------------------------------------------------------------------------------

+# This rule links in binary data with the .bin extension

+#---------------------------------------------------------------------------------

+#%.bin.o	:	%.bin

+#---------------------------------------------------------------------------------

+#	@echo $(notdir $<)

+#	$(bin2o)

+

+

+

+-include $(DEPENDS)

+

+#---------------------------------------------------------------------------------

+endif

+#---------------------------------------------------------------------------------

diff --git a/Source/Dolphin.sln b/Source/Dolphin.sln
index d226dec7d6..b78d8c0148 100644
--- a/Source/Dolphin.sln
+++ b/Source/Dolphin.sln
@@ -583,14 +583,14 @@ Global
 		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release|Win32.Build.0 = Release|Win32

 		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release|x64.ActiveCfg = Release|x64

 		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release|x64.Build.0 = Release|x64

-		{3877AA3E-9CC0-4ADF-8E71-272EE4443478}.Debug|Win32.ActiveCfg = Debug|Win32

-		{3877AA3E-9CC0-4ADF-8E71-272EE4443478}.Debug|x64.ActiveCfg = Debug|x64

-		{3877AA3E-9CC0-4ADF-8E71-272EE4443478}.DebugFast|Win32.ActiveCfg = Debug|Win32

-		{3877AA3E-9CC0-4ADF-8E71-272EE4443478}.DebugFast|x64.ActiveCfg = Debug|x64

-		{3877AA3E-9CC0-4ADF-8E71-272EE4443478}.Release_JITIL|Win32.ActiveCfg = Release|Win32

-		{3877AA3E-9CC0-4ADF-8E71-272EE4443478}.Release_JITIL|x64.ActiveCfg = Release|x64

-		{3877AA3E-9CC0-4ADF-8E71-272EE4443478}.Release|Win32.ActiveCfg = Release|Win32

-		{3877AA3E-9CC0-4ADF-8E71-272EE4443478}.Release|x64.ActiveCfg = Release|x64

+		{3877AA3E-9CC0-4ADF-8E71-272EE4443478}.Debug|Win32.ActiveCfg = Wii|Win32

+		{3877AA3E-9CC0-4ADF-8E71-272EE4443478}.Debug|x64.ActiveCfg = Wii|x64

+		{3877AA3E-9CC0-4ADF-8E71-272EE4443478}.DebugFast|Win32.ActiveCfg = Wii|Win32

+		{3877AA3E-9CC0-4ADF-8E71-272EE4443478}.DebugFast|x64.ActiveCfg = Wii|x64

+		{3877AA3E-9CC0-4ADF-8E71-272EE4443478}.Release_JITIL|Win32.ActiveCfg = Wii|Win32

+		{3877AA3E-9CC0-4ADF-8E71-272EE4443478}.Release_JITIL|x64.ActiveCfg = Wii|x64

+		{3877AA3E-9CC0-4ADF-8E71-272EE4443478}.Release|Win32.ActiveCfg = Wii|Win32

+		{3877AA3E-9CC0-4ADF-8E71-272EE4443478}.Release|x64.ActiveCfg = Wii|x64

 		{C0B84DA9-FF15-4FAB-9590-17132F3C6DE4}.Debug|Win32.ActiveCfg = Debug|Win32

 		{C0B84DA9-FF15-4FAB-9590-17132F3C6DE4}.Debug|Win32.Build.0 = Debug|Win32

 		{C0B84DA9-FF15-4FAB-9590-17132F3C6DE4}.Debug|x64.ActiveCfg = Debug|x64