diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | PSP.workspace | 4 | ||||
| -rw-r--r-- | Project/Project.mk | 2 | ||||
| -rw-r--r-- | Project/Project.project | 45 | ||||
| -rw-r--r-- | Project/PropertiesForm.cpp | 2 | ||||
| -rw-r--r-- | Project/PropertiesForm.wxcp | 2 | ||||
| -rw-r--r-- | docs/_layouts/default.html | 2 | ||||
| -rw-r--r-- | docs/downloads/windows/pspufu.zip | bin | 7807169 -> 0 bytes |
8 files changed, 52 insertions, 6 deletions
@@ -3,6 +3,7 @@ .clang/ .codelite/ Project/Release/ +Project/Release_32/ Project/Debug/ # Compiled source # diff --git a/PSP.workspace b/PSP.workspace index 8132425..42ccea7 100644 --- a/PSP.workspace +++ b/PSP.workspace @@ -10,5 +10,9 @@ <Environment/> <Project Name="Project" ConfigName="Release"/> </WorkspaceConfiguration> + <WorkspaceConfiguration Name="Release_x86_32" Selected="no"> + <Environment/> + <Project Name="Project" ConfigName="Release_x86_32"/> + </WorkspaceConfiguration> </BuildMatrix> </CodeLite_Workspace> diff --git a/Project/Project.mk b/Project/Project.mk index 4aa8df3..b6cfdfa 100644 --- a/Project/Project.mk +++ b/Project/Project.mk @@ -13,7 +13,7 @@ CurrentFileName := CurrentFilePath := CurrentFileFullPath := User :=NDSE-69 -Date :=11/10/2017 +Date :=17/10/2017 CodeLitePath :="C:/Program Files/CodeLite" LinkerName :=C:/TDM-GCC-64/bin/g++.exe SharedObjectLinkerName :=C:/TDM-GCC-64/bin/g++.exe -shared -fPIC diff --git a/Project/Project.project b/Project/Project.project index 091dde7..e07282c 100644 --- a/Project/Project.project +++ b/Project/Project.project @@ -2,7 +2,7 @@ <CodeLite_Project Name="Project" InternalType="GUI" Version="10.0.0"> <Plugins> <Plugin Name="qmake"> - <![CDATA[00020001N0005Debug0000000000000001N0007Release000000000000]]> + <![CDATA[00030001N0005Debug0000000000000001N0007Release0000000000000001N0014Release_x86_32000000000000]]> </Plugin> <Plugin Name="CppCheck"/> </Plugins> @@ -275,7 +275,7 @@ </Linker> <ResourceCompiler Options=""/> </GlobalSettings> - <Configuration Name="Debug" CompilerType="MinGW ( TDM-GCC-32 )" DebuggerType="GNU gdb debugger" Type="Executable" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append"> + <Configuration Name="Debug" CompilerType="MinGW ( TDM-GCC-64 )" DebuggerType="GNU gdb debugger" Type="Executable" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append"> <Compiler Options="-g;-O0;-Wall;$(shell wx-config --cflags) " C_Options="-g;-O0;-Wall" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0"> <IncludePath Value="."/> <Preprocessor Value="UNICODE"/> @@ -356,5 +356,46 @@ <SearchPaths/> </Completion> </Configuration> + <Configuration Name="Release_x86_32" CompilerType="MinGW ( TDM-GCC-32 )" DebuggerType="GNU gdb debugger" Type="Executable" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append"> + <Compiler Options="-O2;-Wall;$(shell wx-config --cflags);-std=c++11" C_Options="-O2;-Wall" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0"> + <IncludePath Value="."/> + <Preprocessor Value="NDEBUG"/> + <Preprocessor Value="UNICODE"/> + </Compiler> + <Linker Options="$(shell wx-config --libs gl);-mwindows" Required="yes"/> + <ResourceCompiler Options="$(shell wx-config --rcflags)" Required="no"/> + <General OutputFile="$(IntermediateDirectory)/pspufu" IntermediateDirectory="./Release_32" Command="./pspufu" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="no" IsGUIProgram="yes" IsEnabled="yes"/> + <BuildSystem Name="Default"/> + <Environment EnvVarSetName="<Use Defaults>" DbgSetName="<Use Defaults>"> + <![CDATA[]]> + </Environment> + <Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="" IsExtended="no"> + <DebuggerSearchPaths/> + <PostConnectCommands/> + <StartupCommands/> + </Debugger> + <PreBuild/> + <PostBuild/> + <CustomBuild Enabled="no"> + <RebuildCommand/> + <CleanCommand/> + <BuildCommand/> + <PreprocessFileCommand/> + <SingleFileCommand/> + <MakefileGenerationCommand/> + <ThirdPartyToolName>None</ThirdPartyToolName> + <WorkingDirectory/> + </CustomBuild> + <AdditionalRules> + <CustomPostBuild/> + <CustomPreBuild/> + </AdditionalRules> + <Completion EnableCpp11="no" EnableCpp14="no"> + <ClangCmpFlagsC/> + <ClangCmpFlags/> + <ClangPP/> + <SearchPaths/> + </Completion> + </Configuration> </Settings> </CodeLite_Project> diff --git a/Project/PropertiesForm.cpp b/Project/PropertiesForm.cpp index bd09f3e..8d030ea 100644 --- a/Project/PropertiesForm.cpp +++ b/Project/PropertiesForm.cpp @@ -532,7 +532,7 @@ AboutFormBase::AboutFormBase(wxWindow* parent, wxWindowID id, const wxString& ti flexGridSizer247->Add(m_staticTextVersionLabel, 0, wxALL, WXC_FROM_DIP(5)); - m_staticTextVersion = new wxStaticText(this, wxID_ANY, _("Alpha 2017w41a"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), 0); + m_staticTextVersion = new wxStaticText(this, wxID_ANY, _("Alpha 2017w42b"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), 0); flexGridSizer247->Add(m_staticTextVersion, 0, wxALL, WXC_FROM_DIP(5)); diff --git a/Project/PropertiesForm.wxcp b/Project/PropertiesForm.wxcp index c3fc587..4cef2f5 100644 --- a/Project/PropertiesForm.wxcp +++ b/Project/PropertiesForm.wxcp @@ -5801,7 +5801,7 @@ }, { "type": "multi-string", "m_label": "Label:", - "m_value": "Alpha 2017w41a" + "m_value": "Alpha 2017w42b" }, { "type": "string", "m_label": "Wrap:", diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html index 7f419d4..d55bebe 100644 --- a/docs/_layouts/default.html +++ b/docs/_layouts/default.html @@ -19,7 +19,7 @@ <a href="{{ site.github.repository_url }}" class="btn">Ver no GitHub</a> {% endif %} {% if site.show_downloads %} - <a href="https://github.com/Thales1330/PSP/raw/master/docs/downloads/windows/pspufu.zip" class="btn">Download para Windows (x86-64)</a> + <a href="https://github.com/Thales1330/PSP/releases/latest" class="btn">Download</a> <!--a href="{{ site.github.zip_url }}" class="btn">Download código fonte</a--> <!--a href="{{ site.github.tar_url }}" class="btn">Download .tar.gz</a--> {% endif %} diff --git a/docs/downloads/windows/pspufu.zip b/docs/downloads/windows/pspufu.zip Binary files differdeleted file mode 100644 index 594e487..0000000 --- a/docs/downloads/windows/pspufu.zip +++ /dev/null |