forks
/
dlangui
mirror of https://github.com/buggins/dlangui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:buggins/dlangui

This commit is contained in:
Vadim Lopatin 2015-01-15 12:28:45 +03:00
parent 477dababd8 789e435d3f
commit de9bdf2965
5 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlanguilib.visualdproj
View File

@ -89,6 +89,7 @@
<resfile /> <resfile />
<exefile>$(OutDir)\$(ProjectName).lib</exefile> <exefile>$(OutDir)\$(ProjectName).lib</exefile>
<useStdLibPath>1</useStdLibPath> <useStdLibPath>1</useStdLibPath>
<cRuntime>2</cRuntime>
<additionalOptions /> <additionalOptions />
<preBuildCommand /> <preBuildCommand />
<postBuildCommand /> <postBuildCommand />
@ -141,7 +142,7 @@
<compiler>0</compiler> <compiler>0</compiler>
<otherDMD>0</otherDMD> <otherDMD>0</otherDMD>
<program>$(DMDInstallDir)windows\bin\dmd.exe</program> <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
<imppath>3rdparty ../DerelictGL3/source</imppath> <imppath>3rdparty ../DerelictGL3/source $(SolutionDir)/../dlib</imppath>
<fileImppath /> <fileImppath />
<outdir>$(ConfigurationName)</outdir> <outdir>$(ConfigurationName)</outdir>
<objdir>$(OutDir)</objdir> <objdir>$(OutDir)</objdir>
@ -160,7 +161,7 @@
<debuglevel>0</debuglevel> <debuglevel>0</debuglevel>
<debugids /> <debugids />
<versionlevel>0</versionlevel> <versionlevel>0</versionlevel>
<versionids /> <versionids>Unicode</versionids>
<dump_source>0</dump_source> <dump_source>0</dump_source>
<mapverbosity>0</mapverbosity> <mapverbosity>0</mapverbosity>
<createImplib>0</createImplib> <createImplib>0</createImplib>
@ -183,6 +184,7 @@
<resfile /> <resfile />
<exefile>$(OutDir)\$(ProjectName).lib</exefile> <exefile>$(OutDir)\$(ProjectName).lib</exefile>
<useStdLibPath>1</useStdLibPath> <useStdLibPath>1</useStdLibPath>
<cRuntime>1</cRuntime>
<additionalOptions /> <additionalOptions />
<preBuildCommand /> <preBuildCommand />
<postBuildCommand /> <postBuildCommand />

4
examples/example1/example1.visualdproj
View File

@ -89,6 +89,7 @@
<resfile /> <resfile />
<exefile>$(OutDir)\$(ProjectName).exe</exefile> <exefile>$(OutDir)\$(ProjectName).exe</exefile>
<useStdLibPath>1</useStdLibPath> <useStdLibPath>1</useStdLibPath>
<cRuntime>2</cRuntime>
<additionalOptions>-profile</additionalOptions> <additionalOptions>-profile</additionalOptions>
<preBuildCommand /> <preBuildCommand />
<postBuildCommand /> <postBuildCommand />
@ -141,7 +142,7 @@
<compiler>0</compiler> <compiler>0</compiler>
<otherDMD>0</otherDMD> <otherDMD>0</otherDMD>
<program>$(DMDInstallDir)windows\bin\dmd.exe</program> <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
<imppath>../../src ../../3rdparty ../../3rdparty/libpng/source</imppath> <imppath>../../src ../../3rdparty ../../3rdparty/libpng/source $(SolutionDir)/../dlib</imppath>
<fileImppath /> <fileImppath />
<outdir>$(ConfigurationName)</outdir> <outdir>$(ConfigurationName)</outdir>
<objdir>$(OutDir)</objdir> <objdir>$(OutDir)</objdir>
@ -183,6 +184,7 @@
<resfile /> <resfile />
<exefile>$(OutDir)\$(ProjectName).exe</exefile> <exefile>$(OutDir)\$(ProjectName).exe</exefile>
<useStdLibPath>1</useStdLibPath> <useStdLibPath>1</useStdLibPath>
<cRuntime>1</cRuntime>
<additionalOptions /> <additionalOptions />
<preBuildCommand /> <preBuildCommand />
<postBuildCommand /> <postBuildCommand />

2
examples/helloworld/helloworld.visualdproj
View File

@ -142,7 +142,7 @@
<compiler>0</compiler> <compiler>0</compiler>
<otherDMD>0</otherDMD> <otherDMD>0</otherDMD>
<program>$(DMDInstallDir)windows\bin\dmd.exe</program> <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
<imppath>../../src ../../3rdparty ../../3rdparty/libpng/source</imppath> <imppath>../../src ../../3rdparty ../../3rdparty/libpng/source $(SolutionDir)/../dlib</imppath>
<fileImppath /> <fileImppath />
<outdir>$(ConfigurationName)</outdir> <outdir>$(ConfigurationName)</outdir>
<objdir>$(OutDir)</objdir> <objdir>$(OutDir)</objdir>

2
examples/tetris/tetris.visualdproj
View File

@ -142,7 +142,7 @@
<compiler>0</compiler> <compiler>0</compiler>
<otherDMD>0</otherDMD> <otherDMD>0</otherDMD>
<program>$(DMDInstallDir)windows\bin\dmd.exe</program> <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
<imppath>../../src ../../3rdparty ../../3rdparty/libpng/source</imppath> <imppath>../../src ../../3rdparty ../../3rdparty/libpng/source $(SolutionDir)/../dlib</imppath>
<fileImppath /> <fileImppath />
<outdir>$(ConfigurationName)</outdir> <outdir>$(ConfigurationName)</outdir>
<objdir>$(OutDir)</objdir> <objdir>$(OutDir)</objdir>

7
src/dlangui/platforms/common/platform.d
View File

@ -753,8 +753,13 @@ mixin template APP_ENTRY_POINT() {
extern (Windows) int WinMain(void* hInstance, void* hPrevInstance, extern (Windows) int WinMain(void* hInstance, void* hPrevInstance,
char* lpCmdLine, int nCmdShow) char* lpCmdLine, int nCmdShow)
{ {
return DLANGUIWinMain(hInstance, hPrevInstance, try {
return DLANGUIWinMain(hInstance, hPrevInstance,
lpCmdLine, nCmdShow); lpCmdLine, nCmdShow);
} catch (Exception e) {
Log.e("Exception: ", e);
return 1;
}
} }
} }
} }